Changeset 3464 in MondoRescue

Timestamp:

Sep 10, 2015, 11:52:41 AM (9 years ago)

Author:

Bruno Cornec

Message:

• suppress function archive_this_fileset_with_star and handle the star case in the std archive_this_fileset function to benefit from std features. Should help solving the issue reported on scratchdir not emptied in star case. Removes also duplicated code.

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-archive-EXT.h (modified) (2 diffs)
• libmondo-archive.c (modified) (7 diffs)
• libmondo-archive.h (modified) (1 diff)

branches/3.2/mondo/src/common/libmondo-archive-EXT.h

@@ -2 +2 @@
 
 
-extern int archive_this_fileset(char *filelist,
-                                char *fname, int setno);
+extern int archive_this_fileset(char *filelist, char *fname, int setno);
 extern int backup_data();
 extern int call_mindi_to_supply_boot_disks();
@@ -35 +34 @@
 extern int call_growisofs(char *destfile);
 extern int make_afioballs_and_images_SINGLETHREAD();
-extern int archive_this_fileset_with_star(
-                                          char *filelist, char *fname,
-                                          int setno);
 extern void setenv_mondo_share(void);

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -187 +187 @@
 extern int g_tape_buffer_size_MB;
 
-
-
-
-int
-archive_this_fileset_with_star(char *filelist, char *fname, int setno)
-{
-    int retval = 0;
-    unsigned int res = 0;
-    int tries = 0;
-    char *command = NULL;
-    char *tmp = NULL;
-    char *p;
-
-
-    if (!does_file_exist(filelist)) {
-        log_to_screen("(archive_this_fileset) - filelist %s does not exist", filelist);
-        return (1);
-    }
-
-    mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
-    if (system(tmp)) {
-        mr_free(tmp);
-        fatal_error("Unable to write tarball to scratchdir");
-    }
-    paranoid_free(tmp);
-
-    mr_asprintf(command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s", filelist, fname);
-    if (bkpinfo->use_lzo) {
-        mr_free(command);
-        fatal_error("Can't use lzop");
-    }
-    if (bkpinfo->compression_level > 0) {
-        mr_strcat(command, " -bz");
-    }
-    mr_strcat(command, " 2>> %s", MONDO_LOGFILE);
-    log_msg(4, "command = '%s'", command);
-
-    for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
-        log_msg(5, "command='%s'", command);
-        res = system(command);
-        mr_asprintf(tmp, "%s", last_line_of_file(MONDO_LOGFILE));
-        log_msg(1, "res=%d; tmp='%s'", res, tmp);
-        if (bkpinfo->use_star && (res == 254 || res == 65024)
-            && strstr(tmp, "star: Processed all possible files")
-            && tries > 0) {
-            log_msg(1, "Star returned nonfatal error");
-            res = 0;
-        }
-        mr_free(tmp);
-
-        if (res) {
-            log_OS_error(command);
-            p = strstr(command, "-acl ");
-            if (p) {
-                p[0] = p[1] = p[2] = p[3] = ' ';
-                log_msg(1, "new command = '%s'", command);
-            } else {
-                log_msg(3,
-                        "Attempt #%d failed. Pausing 3 seconds and retrying...",
-                        tries + 1);
-                sleep(3);
-            }
-        }
-    }
-    mr_free(command);
-
-    retval += res;
-    if (retval) {
-        log_msg(3, "Failed to write set %d", setno);
-    } else if (tries > 1) {
-        log_msg(3, "Succeeded in writing set %d, on try #%d", setno,
-                tries);
-    }
-    return (retval);
-}
-
-
 /**
  * Call @c afio to archive the filelist @c filelist to the file @c fname.
@@ -286 +209 @@
     /*@ int *************************************************************** */
     int retval = 0;
-    int res = 0;
+    unsigned int res = 0;
     int tries = 0;
     /*
@@ -297 +220 @@
     char *zipparams = NULL;
     char *tmp = NULL;
+    char *p = NULL;
 
     assert(bkpinfo != NULL);
@@ -302 +226 @@
     assert_string_is_neither_NULL_nor_zerolength(fname);
 
-    if (bkpinfo->compression_level > 0 && bkpinfo->use_star) {
-        return (archive_this_fileset_with_star(filelist, fname, setno));
+    if (!does_file_exist(bkpinfo->tmpdir)) {
+        log_OS_error("tmpdir not found");
+        fatal_error("tmpdir not found");
+    }
+    if (!does_file_exist(bkpinfo->scratchdir)) {
+        log_OS_error("scratchdir not found");
+        fatal_error("scratchdir not found");
     }
 
@@ -319 +248 @@
 
     if (bkpinfo->compression_level > 0) {
-        mr_asprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
-        //       -b %ld, TAPE_BLOCK_SIZE
-        mr_asprintf(zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe, bkpinfo->compression_level);
-        if (does_file_exist(tmp)) {
-            mr_strcat(zipparams, " -E %s",tmp);
+        if (bkpinfo->use_star) {
+            if (bkpinfo->use_lzo) {
+                fatal_error("Can't use lzop with star");
+            }
+            mr_asprintf(zipparams, " -bz");
         } else {
-            log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
-        }
-        mr_free(tmp);
+            mr_asprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
+            //       -b %ld, TAPE_BLOCK_SIZE
+            mr_asprintf(zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe, bkpinfo->compression_level);
+            if (does_file_exist(tmp)) {
+                mr_strcat(zipparams, " -E %s",tmp);
+            } else {
+                log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
+            }
+            mr_free(tmp);
+        }
     } else {
         mr_asprintf(zipparams, "");
     }
 
-    if (!does_file_exist(bkpinfo->tmpdir)) {
-        log_OS_error("tmpdir not found");
-        fatal_error("tmpdir not found");
-    }
-    if (!does_file_exist(bkpinfo->scratchdir)) {
-        log_OS_error("scratchdir not found");
-        fatal_error("scratchdir not found");
-    }
     mr_asprintf(command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname, fname, bkpinfo->zip_suffix);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s", TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
+    if (bkpinfo->use_star) {
+        mr_asprintf(command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s %s 2>> %s", filelist, fname, zipparams, MONDO_LOGFILE);
+    } else {
+        mr_asprintf(command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s", TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
+    }
     mr_free(zipparams);
-
-    mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
-    if (system(tmp)) {
-        mr_free(tmp);
-        fatal_error("Unable to write tarball to scratchdir");
-    }
-    mr_free(tmp);
+    log_msg(4, "command = '%s'", command);
 
     for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
         log_msg(5, "command='%s'", command);
         res = system(command);
+
+        if (bkpinfo->use_star) {
+            mr_asprintf(tmp, "%s", last_line_of_file(MONDO_LOGFILE));
+            log_msg(1, "res=%d; tmp='%s'", res, tmp);
+            if ((res == 254 || res == 65024) && strstr(tmp, "star: Processed all possible files") && tries > 0) {
+                log_msg(1, "Star returned nonfatal error");
+                res = 0;
+            }
+            mr_free(tmp);
+        }
         if (res) {
             log_OS_error(command);
-            log_msg(3,
-                    "Attempt #%d failed. Pausing 3 seconds and retrying...",
-                    tries + 1);
+            if (bkpinfo->use_star) {
+                p = strstr(command, "-acl ");
+                if (p) {
+                    p[0] = p[1] = p[2] = p[3] = ' ';
+                    log_msg(1, "new command = '%s'", command);
+                }
+            }
+            log_msg(3, "Attempt #%d failed. Pausing 3 seconds and retrying...", tries + 1);
             sleep(3);
         }
     }
-    paranoid_free(command);
+    mr_free(command);
 
     retval += res;
@@ -371 +312 @@
         log_msg(3, "Failed to write set %d", setno);
     } else if (tries > 1) {
-        log_msg(3, "Succeeded in writing set %d, on try #%d", setno,
-                tries);
+        log_msg(3, "Succeeded in writing set %d, on try #%d", setno, tries);
     }
 
@@ -2138 +2078 @@
 
         log_msg(1, "Archiving set %ld", curr_set_no);
-        res =
-            archive_this_fileset(curr_filelist_fname,
-                                 curr_afioball_fname, curr_set_no);
+        res = archive_this_fileset(curr_filelist_fname, curr_afioball_fname, curr_set_no);
         retval += res;
         if (res) {

branches/3.2/mondo/src/common/libmondo-archive.h

@@ -36 +36 @@
 int call_growisofs(char *destfile);
 int make_afioballs_and_images_SINGLETHREAD();
-int archive_this_fileset_with_star(
-                                   char *filelist, char *fname, int setno);
 void setenv_mondo_share(void);