Changeset 2048 in MondoRescue for branches/2.2.8

Timestamp:

Oct 22, 2008, 6:53:57 PM (16 years ago)

Author:

Bruno Cornec

Message:

Remove monitas code from tree

Location:

branches/2.2.8

Files:

• mondo-doc/MonitasConcepts.lyx (deleted)
• mondo/src/common/libmondo-files.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-restore-EXT.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-restore.h (modified) (1 diff)
• mondo/src/mondorestore/mondorestore.c (modified) (2 diffs)
• monitas (deleted)
• website/monitas (deleted)
• website/monitas.shtml (deleted)

branches/2.2.8/mondo/src/common/libmondo-files.c

@@ -793 +793 @@
     paranoid_fclose(fin);
     return (matches);
-}
-
-
-
-
-/**
- * Register our PID in a file in /var/run.
- * The PID will be put in /var/run/monitas-<tt>name_str</tt>.pid.
- * @param pid 0 to remove file, anything else to create it.
- * @param name_str The basename of the PID file (e.g. "mondo" or "server")
- * @note This function does not provide support against multiple instances, unless you check for that yourself.
- */
-void register_pid(pid_t pid, char *name_str)
-{
-    char tmp[MAX_STR_LEN + 1], lockfile_fname[MAX_STR_LEN + 1];
-    int res;
-    FILE *fin;
-
-    sprintf(lockfile_fname, "/var/run/monitas-%s.pid", name_str);
-    if (!pid) {
-        log_it("Unregistering PID");
-        if (unlink(lockfile_fname)) {
-            log_it("Error unregistering PID");
-        }
-        return;
-    }
-    if (does_file_exist(lockfile_fname)) {
-        tmp[0] = '\0';
-        if ((fin = fopen(lockfile_fname, "r"))) {
-            (void) fgets(tmp, MAX_STR_LEN, fin);
-            paranoid_fclose(fin);
-        } else {
-            log_OS_error("Unable to openin lockfile_fname");
-        }
-        pid = (pid_t) atol(tmp);
-        sprintf(tmp, "ps %ld > /dev/null 2> /dev/null", (long int) pid);
-        res = system(tmp);
-        if (!res) {
-            log_it
-                ("I believe the daemon is already running. If it isn't, please delete %s and try again.",
-                 lockfile_fname);
-        }
-    }
-    sprintf(tmp, "echo %ld > %s 2> /dev/null", (long int) getpid(),
-            lockfile_fname);
-    if (system(tmp)) {
-        fatal_error("Cannot register PID");
-    }
 }
 

branches/2.2.8/mondo/src/mondorestore/mondo-restore-EXT.h

@@ -63 +63 @@
                                             struct s_node *);
 extern int restore_everything(struct s_node *);
-extern int restore_live_from_monitas_server(char *,
-                                            char *, char *);
 extern int restore_to_live_filesystem();
 extern void swap_mountlist_entries(struct mountlist_itself *, int, int);

branches/2.2.8/mondo/src/mondorestore/mondo-restore.h

@@ -37 +37 @@
 int restore_all_tarballs_from_stream(struct s_node *);
 int restore_everything(struct s_node *);
-int restore_live_from_monitas_server(char *, char *,
-                                     char *);
 int restore_to_live_filesystem();
 void swap_mountlist_entries(struct mountlist_itself *, int, int);

branches/2.2.8/mondo/src/mondorestore/mondorestore.c

@@ -2726 +2726 @@
 
 
-
-/**
- * @brief Haha. You wish! (This function is not implemented :-)
- */
-int
-restore_live_from_monitas_server(char *monitas_device,
-                                 char *restore_this_directory,
-                                 char *restore_here)
-     /* NB: bkpinfo hasn't been populated yet, except for ->tmp which is "/tmp" */
-{
-    FILE *fout;
-    int retval = 0;
-    int i;
-    int j;
-    struct mountlist_itself the_mountlist;
-    static struct raidlist_itself the_raidlist;
-  /** malloc **/
-    char tmp[MAX_STR_LEN + 1];
-    char command[MAX_STR_LEN + 1];
-    char datablock[256 * 1024];
-    char datadisks_fname[MAX_STR_LEN + 1];
-    long k;
-    long length;
-    long long llt;
-    struct s_node *filelist = NULL;
-    assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(monitas_device);
-    assert(restore_this_directory != NULL);
-    assert(restore_here != NULL);
-
-    sprintf(tmp, "restore_here = '%s'", restore_here);
-
-    log_msg(2, tmp);
-
-    log_msg(2, "restore_live_from_monitas_server() - starting");
-    unlink("/tmp/mountlist.txt");
-    unlink("/tmp/filelist.full");
-    unlink("/tmp/biggielist.txt");
-    if (restore_here[0] == '\0') {
-        strcpy(bkpinfo->restore_path, MNT_RESTORING);
-    } else {
-        strcpy(bkpinfo->restore_path, restore_here);
-    }
-    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
-    sprintf(tmp, "FYI - data will be restored to %s",
-            bkpinfo->restore_path);
-    log_msg(3, tmp);
-    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
-    sprintf(datadisks_fname, "/tmp/mondorestore.datadisks.%d",
-            (int) (random() % 32768));
-    chdir(bkpinfo->tmpdir);
-
-    sprintf(command, "cat %s", monitas_device);
-    g_tape_stream = popen(command, "r");    // for compatibility with openin_tape()
-    if (!(fout = fopen(datadisks_fname, "w"))) {
-        log_OS_error(datadisks_fname);
-        return (1);
-    }
-    for (i = 0; i < 32; i++) {
-        for (j = 0; j < 4; j++) {
-            for (length = k = 0; length < 256 * 1024; length += k) {
-                k = fread(datablock + length, 1, 256 * 1024 - length,
-                          g_tape_stream);
-            }
-            fwrite(datablock, 1, length, fout);
-            g_tape_posK += length;
-        }
-    }
-    paranoid_fclose(fout);
-    sprintf(command,
-            "tar -zxvf %s ./tmp/mondo-restore.cfg ./tmp/mountlist.txt ./tmp/filelist.full ./tmp/biggielist.txt",
-            datadisks_fname);
-    run_program_and_log_output(command, 4);
-    read_header_block_from_stream(&llt, tmp, &i);
-    read_header_block_from_stream(&llt, tmp, &i);
-
-    unlink(datadisks_fname);
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
-    retval = load_mountlist(&the_mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo   strcpy(bkpinfo->media_device, monitas_device);
-
-
-    load_raidtab_into_raidlist(&the_raidlist, RAIDTAB_FNAME);
-    iamhere("FIXME");
-    fatal_error("This will fail");
-    sprintf(command,
-            "grep -E '^%s.*$' %s > %s",
-            restore_this_directory, g_filelist_full, g_filelist_full);
-    if (system(command)) {
-        retval++;
-        log_to_screen
-            ("Error(s) occurred while processing filelist and wildcard");
-    }
-    iamhere("FIXME");
-    fatal_error("This will fail");
-    sprintf(command,
-            "grep -E '^%s.*$' %s > %s",
-            restore_this_directory, g_biggielist_txt, g_biggielist_txt);
-    if (system(command)) {
-        log_msg(1,
-                "Error(s) occurred while processing biggielist and wildcard");
-    }
-    sprintf(command, "touch %s", g_biggielist_txt);
-    run_program_and_log_output(command, FALSE);
-//  filelist = load_filelist(g_filelist_restthese);  // FIXME --- this probably doesn't work because it doesn't include the biggiefiles
-    retval += restore_everything(filelist);
-    free_filelist(filelist);
-    log_msg(2, "--------End of restore_live_from_monitas_server--------");
-    return (retval);
-}
-
-/**************************************************************************
- *END_RESTORE_LIVE_FROM_MONITAS_SERVER                                    *
- **************************************************************************/
-
-
-
-
 extern void wait_until_software_raids_are_prepped(char *, int);
 
@@ -3184 +3067 @@
             g_restoring_live_from_nfs = TRUE;
         }
-        if (argc == 5 && strcmp(argv[1], "--monitas-live") == 0) {
-            retval =
-                restore_live_from_monitas_server(argv[2],
-                                                argv[3], argv[4]);
-        } else {
-            log_msg(2, "Calling restore_to_live_filesystem()");
-            retval = restore_to_live_filesystem();
-        }
+        log_msg(2, "Calling restore_to_live_filesystem()");
+        retval = restore_to_live_filesystem();
+
         log_msg(2, "Still here. Yay.");
         if ((strlen(bkpinfo->tmpdir) > 0) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {