X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fdird%2Fua_restore.c;h=54a16be6d7ab551a4be4981e361f5d006d03ef98;hb=a80e5ce0c2e9476c9ce7d8a641b6f3e56f5d3735;hp=ffae520a02a37cc20f4e6dd9090ddcdc4d694d8c;hpb=a8233b9baea725a18a7c159c69417e8bce0d423a;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c index ffae520a02..54a16be6d7 100644 --- a/bacula/src/dird/ua_restore.c +++ b/bacula/src/dird/ua_restore.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2002-2007 Free Software Foundation Europe e.V. + Copyright (C) 2002-2009 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark of Kern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. @@ -58,7 +58,7 @@ static void free_name_list(NAME_LIST *name_list); static bool select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date); static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx); static void free_rx(RESTORE_CTX *rx); -static void split_path_and_filename(RESTORE_CTX *rx, char *fname); +static void split_path_and_filename(UAContext *ua, RESTORE_CTX *rx, char *fname); static int jobid_fileindex_handler(void *ctx, int num_fields, char **row); static bool insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *file, char *date); @@ -70,6 +70,7 @@ static int get_restore_client_name(UAContext *ua, RESTORE_CTX &rx); static int get_date(UAContext *ua, char *date, int date_len); static int restore_count_handler(void *ctx, int num_fields, char **row); static bool insert_table_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *table); +static void get_and_display_basejobs(UAContext *ua, RESTORE_CTX *rx); /* * Restore files @@ -90,6 +91,7 @@ int restore_cmd(UAContext *ua, const char *cmd) rx.path = get_pool_memory(PM_FNAME); rx.fname = get_pool_memory(PM_FNAME); rx.JobIds = get_pool_memory(PM_FNAME); + rx.BaseJobIds = get_pool_memory(PM_FNAME); rx.query = get_pool_memory(PM_FNAME); rx.bsr = new_bsr(); @@ -174,6 +176,7 @@ int restore_cmd(UAContext *ua, const char *cmd) case 0: /* error */ goto bail_out; case 1: /* selected by jobid */ + get_and_display_basejobs(ua, &rx); if (!build_directory_tree(ua, &rx)) { ua->send_msg(_("Restore not done.\n")); goto bail_out; @@ -194,6 +197,8 @@ int restore_cmd(UAContext *ua, const char *cmd) ua->warning_msg(_("No files selected to be restored.\n")); goto bail_out; } + display_bsr_info(ua, rx); /* display vols needed, etc */ + /* If no count of files, use bsr generated value (often wrong) */ if (rx.selected_files == 0) { rx.selected_files = selected_files; @@ -233,7 +238,7 @@ int restore_cmd(UAContext *ua, const char *cmd) escaped_where_name = escape_filename(rx.RegexWhere); Mmsg(ua->cmd, "run job=\"%s\" client=\"%s\" restoreclient=\"%s\" storage=\"%s\"" - " bootstrap=\"%s\" regexwhere=\"%s\" files=%d catalog=\"%s\"", + " bootstrap=\"%s\" regexwhere=\"%s\" files=%u catalog=\"%s\"", job->name(), rx.ClientName, rx.RestoreClientName, rx.store?rx.store->name():"", escaped_bsr_name ? escaped_bsr_name : jcr->RestoreBootstrap, @@ -244,7 +249,7 @@ int restore_cmd(UAContext *ua, const char *cmd) escaped_where_name = escape_filename(rx.where); Mmsg(ua->cmd, "run job=\"%s\" client=\"%s\" restoreclient=\"%s\" storage=\"%s\"" - " bootstrap=\"%s\" where=\"%s\" files=%d catalog=\"%s\"", + " bootstrap=\"%s\" where=\"%s\" files=%u catalog=\"%s\"", job->name(), rx.ClientName, rx.RestoreClientName, rx.store?rx.store->name():"", escaped_bsr_name ? escaped_bsr_name : jcr->RestoreBootstrap, @@ -254,7 +259,7 @@ int restore_cmd(UAContext *ua, const char *cmd) } else { Mmsg(ua->cmd, "run job=\"%s\" client=\"%s\" restoreclient=\"%s\" storage=\"%s\"" - " bootstrap=\"%s\" files=%d catalog=\"%s\"", + " bootstrap=\"%s\" files=%u catalog=\"%s\"", job->name(), rx.ClientName, rx.RestoreClientName, rx.store?rx.store->name():"", escaped_bsr_name ? escaped_bsr_name : jcr->RestoreBootstrap, @@ -300,26 +305,35 @@ bail_out: } +/* + * Fill the rx->BaseJobIds and display the list + */ +static void get_and_display_basejobs(UAContext *ua, RESTORE_CTX *rx) +{ + db_list_ctx jobids; + + if (!db_get_used_base_jobids(ua->jcr, ua->db, rx->JobIds, &jobids)) { + ua->warning_msg("%s", db_strerror(ua->db)); + } + + if (jobids.count) { + POOL_MEM q; + Mmsg(q, uar_print_jobs, jobids.list); + ua->send_msg(_("The restore will use the following job(s) as Base\n")); + db_list_sql_query(ua->jcr, ua->db, q.c_str(), prtit, ua, 1, HORZ_LIST); + } + pm_strcpy(rx->BaseJobIds, jobids.list); +} + static void free_rx(RESTORE_CTX *rx) { free_bsr(rx->bsr); rx->bsr = NULL; - if (rx->JobIds) { - free_pool_memory(rx->JobIds); - rx->JobIds = NULL; - } - if (rx->fname) { - free_pool_memory(rx->fname); - rx->fname = NULL; - } - if (rx->path) { - free_pool_memory(rx->path); - rx->path = NULL; - } - if (rx->query) { - free_pool_memory(rx->query); - rx->query = NULL; - } + free_and_null_pool_memory(rx->JobIds); + free_and_null_pool_memory(rx->BaseJobIds); + free_and_null_pool_memory(rx->fname); + free_and_null_pool_memory(rx->path); + free_and_null_pool_memory(rx->query); free_name_list(&rx->name_list); } @@ -415,6 +429,7 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) _("Find the JobIds of the most recent backup for a client"), _("Find the JobIds for a backup for a client before a specified time"), _("Enter a list of directories to restore for found JobIds"), + _("Select full restore to a specified Job date"), _("Cancel"), NULL }; @@ -442,10 +457,11 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) "add_suffix", /* 17 */ "regexwhere", /* 18 */ "restoreclient", /* 19 */ + "copies", /* 20 */ NULL }; - *rx->JobIds = 0; + rx->JobIds[0] = 0; for (i=1; iargc; i++) { /* loop through arguments */ bool found_kw = false; @@ -552,6 +568,7 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) char *fname; int len; bool gui_save; + db_list_ctx jobids; start_prompt(ua, _("To select the JobIds, you have the following choices:\n")); for (int i=0; list[i]; i++) { @@ -581,8 +598,8 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) } len = strlen(ua->cmd); fname = (char *)malloc(len * 2 + 1); - db_escape_string(fname, ua->cmd, len); - Mmsg(rx->query, uar_file, rx->ClientName, fname); + db_escape_string(ua->jcr, ua->db, fname, ua->cmd, len); + Mmsg(rx->query, uar_file[db_type], rx->ClientName, fname); free(fname); gui_save = ua->jcr->gui; ua->jcr->gui = true; @@ -733,11 +750,35 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) } return 2; - case 11: /* Cancel or quit */ + case 11: /* Choose a jobid and select jobs */ + if (!get_cmd(ua, _("Enter JobId to get the state to restore: ")) || + !is_an_integer(ua->cmd)) + { + return 0; + } + + memset(&jr, 0, sizeof(JOB_DBR)); + jr.JobId = str_to_int64(ua->cmd); + if (!db_get_job_record(ua->jcr, ua->db, &jr)) { + ua->error_msg(_("Unable to get Job record for JobId=%s: ERR=%s\n"), + ua->cmd, db_strerror(ua->db)); + return 0; + } + ua->send_msg(_("Selecting jobs to build the Full state at %s\n"), + jr.cStartTime); + jr.JobLevel = L_INCREMENTAL; /* Take Full+Diff+Incr */ + if (!db_accurate_get_jobids(ua->jcr, ua->db, &jr, &jobids)) { + return 0; + } + pm_strcpy(rx->JobIds, jobids.list); + Dmsg1(30, "Item 12: jobids = %s\n", rx->JobIds); + break; + case 12: /* Cancel or quit */ return 0; } } + memset(&jr, 0, sizeof(JOB_DBR)); POOLMEM *JobIds = get_pool_memory(PM_FNAME); *JobIds = 0; rx->TotalFiles = 0; @@ -784,6 +825,7 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) ua->warning_msg(_("No Jobs selected.\n")); return 0; } + if (strchr(rx->JobIds,',')) { ua->info_msg(_("You have selected the following JobIds: %s\n"), rx->JobIds); } else { @@ -868,7 +910,7 @@ static bool insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *f char *date) { strip_trailing_newline(file); - split_path_and_filename(rx, file); + split_path_and_filename(ua, rx, file); if (*rx->JobIds == 0) { Mmsg(rx->query, uar_jobid_fileindex, date, rx->path, rx->fname, rx->ClientName); @@ -896,14 +938,13 @@ static bool insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *f */ static bool insert_dir_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *dir, char *date) -{ +{ strip_trailing_junk(dir); if (*rx->JobIds == 0) { ua->error_msg(_("No JobId specified cannot continue.\n")); return false; } else { - Mmsg(rx->query, uar_jobid_fileindex_from_dir, rx->JobIds, - dir, rx->ClientName); + Mmsg(rx->query, uar_jobid_fileindex_from_dir[db_type], rx->JobIds, dir, rx->ClientName); } rx->found = false; /* Find and insert jobid and File Index */ @@ -939,7 +980,7 @@ static bool insert_table_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char * return true; } -static void split_path_and_filename(RESTORE_CTX *rx, char *name) +static void split_path_and_filename(UAContext *ua, RESTORE_CTX *rx, char *name) { char *p, *f; @@ -967,9 +1008,8 @@ static void split_path_and_filename(RESTORE_CTX *rx, char *name) */ rx->fnl = p - f; if (rx->fnl > 0) { - rx->fname = check_pool_memory_size(rx->fname, rx->fnl+1); - memcpy(rx->fname, f, rx->fnl); /* copy filename */ - rx->fname[rx->fnl] = 0; + rx->fname = check_pool_memory_size(rx->fname, 2*(rx->fnl)+1); + db_escape_string(ua->jcr, ua->db, rx->fname, f, rx->fnl); } else { rx->fname[0] = 0; rx->fnl = 0; @@ -977,9 +1017,8 @@ static void split_path_and_filename(RESTORE_CTX *rx, char *name) rx->pnl = f - name; if (rx->pnl > 0) { - rx->path = check_pool_memory_size(rx->path, rx->pnl+1); - memcpy(rx->path, name, rx->pnl); - rx->path[rx->pnl] = 0; + rx->path = check_pool_memory_size(rx->path, 2*(rx->pnl)+1); + db_escape_string(ua->jcr, ua->db, rx->path, name, rx->pnl); } else { rx->path[0] = 0; rx->pnl = 0; @@ -988,6 +1027,44 @@ static void split_path_and_filename(RESTORE_CTX *rx, char *name) Dmsg2(100, "split path=%s file=%s\n", rx->path, rx->fname); } +static bool ask_for_fileregex(UAContext *ua, RESTORE_CTX *rx) +{ + if (find_arg(ua, NT_("all")) >= 0) { /* if user enters all on command line */ + return true; /* select everything */ + } + ua->send_msg(_("\n\nFor one or more of the JobIds selected, no files were found,\n" + "so file selection is not possible.\n" + "Most likely your retention policy pruned the files.\n")); + if (get_yesno(ua, _("\nDo you want to restore all the files? (yes|no): "))) { + if (ua->pint32_val == 1) + return true; + while (get_cmd(ua, _("\nRegexp matching files to restore? (empty to abort): "))) { + if (ua->cmd[0] == '\0') { + break; + } else { + regex_t *fileregex_re = NULL; + int rc; + char errmsg[500] = ""; + + fileregex_re = (regex_t *)bmalloc(sizeof(regex_t)); + rc = regcomp(fileregex_re, ua->cmd, REG_EXTENDED|REG_NOSUB); + if (rc != 0) { + regerror(rc, fileregex_re, errmsg, sizeof(errmsg)); + } + regfree(fileregex_re); + free(fileregex_re); + if (*errmsg) { + ua->send_msg(_("Regex compile error: %s\n"), errmsg); + } else { + rx->bsr->fileregex = bstrdup(ua->cmd); + return true; + } + } + } + } + return false; +} + static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) { TREE_CTX tree; @@ -1008,7 +1085,6 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) * For display purposes, the same JobId, with different volumes may * appear more than once, however, we only insert it once. */ - int items = 0; p = rx->JobIds; tree.FileEstimate = 0; if (get_next_jobid_from_list(&p, &JobId) > 0) { @@ -1023,6 +1099,20 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) tree.DeltaCount = rx->JobId/50; /* print 50 ticks */ } } + + ua->info_msg(_("\nBuilding directory tree for JobId(s) %s ... "), + rx->JobIds); + +#define new_get_file_list +#ifdef new_get_file_list + if (!db_get_file_list(ua->jcr, ua->db, rx->JobIds, insert_tree_handler, (void *)&tree)) { + ua->error_msg("%s", db_strerror(ua->db)); + } + if (*rx->BaseJobIds) { + pm_strcat(rx->JobIds, ","); + pm_strcat(rx->JobIds, rx->BaseJobIds); + } +#else for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) { char ed1[50]; @@ -1030,9 +1120,6 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) continue; /* eliminate duplicate JobIds */ } last_JobId = JobId; - ua->info_msg(_("\nBuilding directory tree for JobId %s ... "), - edit_int64(JobId, ed1)); - items++; /* * Find files for this JobId and insert them in the tree */ @@ -1041,42 +1128,42 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) ua->error_msg("%s", db_strerror(ua->db)); } } +#endif + /* + * Look at the first JobId on the list (presumably the oldest) and + * if it is marked purged, don't do the manual selection because + * the Job was pruned, so the tree is incomplete. + */ + if (tree.FileCount != 0) { + /* Find out if any Job is purged */ + Mmsg(rx->query, "SELECT SUM(PurgedFiles) FROM Job WHERE JobId IN (%s)", rx->JobIds); + if (!db_sql_query(ua->db, rx->query, restore_count_handler, (void *)rx)) { + ua->error_msg("%s\n", db_strerror(ua->db)); + } + /* rx->JobId is the PurgedFiles flag */ + if (rx->found && rx->JobId > 0) { + tree.FileCount = 0; /* set count to zero, no tree selection */ + } + } if (tree.FileCount == 0) { - ua->send_msg(_("\nThere were no files inserted into the tree, so file selection\n" - "is not possible.Most likely your retention policy pruned the files\n")); - if (!get_yesno(ua, _("\nDo you want to restore all the files? (yes|no): "))) { - OK = false; - } else { + OK = ask_for_fileregex(ua, rx); + if (OK) { last_JobId = 0; for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) { if (JobId == last_JobId) { continue; /* eliminate duplicate JobIds */ } add_findex_all(rx->bsr, JobId); - } - OK = true; + } } } else { char ec1[50]; - if (items==1) { - if (tree.all) { - ua->info_msg(_("\n1 Job, %s files inserted into the tree and marked for extraction.\n"), - edit_uint64_with_commas(tree.FileCount, ec1)); - } - else { - ua->info_msg(_("\n1 Job, %s files inserted into the tree.\n"), - edit_uint64_with_commas(tree.FileCount, ec1)); - } - } - else { - if (tree.all) { - ua->info_msg(_("\n%d Jobs, %s files inserted into the tree and marked for extraction.\n"), - items, edit_uint64_with_commas(tree.FileCount, ec1)); - } - else { - ua->info_msg(_("\n%d Jobs, %s files inserted into the tree.\n"), - items, edit_uint64_with_commas(tree.FileCount, ec1)); - } + if (tree.all) { + ua->info_msg(_("\n%s files inserted into the tree and marked for extraction.\n"), + edit_uint64_with_commas(tree.FileCount, ec1)); + } else { + ua->info_msg(_("\n%s files inserted into the tree.\n"), + edit_uint64_with_commas(tree.FileCount, ec1)); } if (find_arg(ua, NT_("done")) < 0) { @@ -1092,7 +1179,7 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) for (TREE_NODE *node=first_tree_node(tree.root); node; node=next_tree_node(node)) { Dmsg2(400, "FI=%d node=0x%x\n", node->FileIndex, node); if (node->extract || node->extract_dir) { - Dmsg2(400, "type=%d FI=%d\n", node->type, node->FileIndex); + Dmsg3(400, "JobId=%lld type=%d FI=%d\n", (uint64_t)node->JobId, node->type, node->FileIndex); add_findex(rx->bsr, node->JobId, node->FileIndex); if (node->extract && node->type != TN_NEWDIR) { rx->selected_files++; /* count only saved files */ @@ -1124,10 +1211,10 @@ static bool select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *dat /* Create temp tables */ db_sql_query(ua->db, uar_del_temp, NULL, NULL); db_sql_query(ua->db, uar_del_temp1, NULL, NULL); - if (!db_sql_query(ua->db, uar_create_temp, NULL, NULL)) { + if (!db_sql_query(ua->db, uar_create_temp[db_type], NULL, NULL)) { ua->error_msg("%s\n", db_strerror(ua->db)); } - if (!db_sql_query(ua->db, uar_create_temp1, NULL, NULL)) { + if (!db_sql_query(ua->db, uar_create_temp1[db_type], NULL, NULL)) { ua->error_msg("%s\n", db_strerror(ua->db)); } /* @@ -1220,7 +1307,7 @@ static bool select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *dat if (!db_sql_query(ua->db, rx->query, NULL, NULL)) { ua->warning_msg("%s\n", db_strerror(ua->db)); } - /* Now update JobTDate to lock onto Differental, if any */ + /* Now update JobTDate to look into Differental, if any */ rx->JobTDate = 0; if (!db_sql_query(ua->db, uar_sel_all_temp, last_full_handler, (void *)rx)) { ua->warning_msg("%s\n", db_strerror(ua->db)); @@ -1238,16 +1325,22 @@ static bool select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *dat } /* Get the JobIds from that list */ - rx->JobIds[0] = 0; - rx->last_jobid[0] = 0; + rx->last_jobid[0] = rx->JobIds[0] = 0; + if (!db_sql_query(ua->db, uar_sel_jobid_temp, jobid_handler, (void *)rx)) { ua->warning_msg("%s\n", db_strerror(ua->db)); } if (rx->JobIds[0] != 0) { + if (find_arg(ua, NT_("copies")) > 0) { + /* Display a list of all copies */ + db_list_copies_records(ua->jcr, ua->db, 0, rx->JobIds, + prtit, ua, HORZ_LIST); + } /* Display a list of Jobs selected for this restore */ - db_list_sql_query(ua->jcr, ua->db, uar_list_temp, prtit, ua, 1, HORZ_LIST); + db_list_sql_query(ua->jcr, ua->db, uar_list_temp, prtit, ua, 1,HORZ_LIST); ok = true; + } else { ua->warning_msg(_("No jobs found.\n")); } @@ -1258,41 +1351,6 @@ bail_out: return ok; } - -/* - * Return next JobId from comma separated list - * - * Returns: - * 1 if next JobId returned - * 0 if no more JobIds are in list - * -1 there is an error - */ -int get_next_jobid_from_list(char **p, JobId_t *JobId) -{ - char jobid[30]; - char *q = *p; - - jobid[0] = 0; - for (int i=0; i<(int)sizeof(jobid); i++) { - if (*q == 0) { - break; - } else if (*q == ',') { - q++; - break; - } - jobid[i] = *q++; - jobid[i+1] = 0; - } - if (jobid[0] == 0) { - return 0; - } else if (!is_a_number(jobid)) { - return -1; /* error */ - } - *p = q; - *JobId = str_to_int64(jobid); - return 1; -} - static int restore_count_handler(void *ctx, int num_fields, char **row) { RESTORE_CTX *rx = (RESTORE_CTX *)ctx; @@ -1367,10 +1425,7 @@ static void free_name_list(NAME_LIST *name_list) for (int i=0; i < name_list->num_ids; i++) { free(name_list->name[i]); } - if (name_list->name) { - free(name_list->name); - name_list->name = NULL; - } + bfree_and_null(name_list->name); name_list->max_ids = 0; name_list->num_ids = 0; } @@ -1438,6 +1493,8 @@ void find_storage_resource(UAContext *ua, RESTORE_CTX &rx, char *Storage, char * /* Take command line arg, or ask user if none */ rx.store = get_storage_resource(ua, false /* don't use default */); - Dmsg1(200, "Set store=%s\n", rx.store->name()); + if (rx.store) { + Dmsg1(200, "Set store=%s\n", rx.store->name()); + } }