Print warning when drive is unmounted + misc cleanups

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@693 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 717805ff3a4fbe43bda0f2841bc0cbeebb248b2f..fad79e2e080146f6ade4550c66f0c391022e2aeb 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -270,12 +270,12 @@ struct GROUP {
 struct COUNTER {
    RES   hdr;
 
-   int32_t MinValue;                  /* Minimum value */
-   int32_t MaxValue;                  /* Maximum value */
-   int32_t CurrentValue;              /* Current value */
-   CAT   *WrapCounter;                /* Wrap counter name */
-   CAT   *Catalog;                    /* Where to store */
-   bool    created;                   /* Created in DB */
+   int32_t  MinValue;                 /* Minimum value */
+   int32_t  MaxValue;                 /* Maximum value */
+   int32_t  CurrentValue;             /* Current value */
+   COUNTER *WrapCounter;              /* Wrap counter name */
+   CAT     *Catalog;                  /* Where to store */
+   bool     created;                  /* Created in DB */
 };
 
 /*

diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c
index a8459d7ad257eeda4a2e75589d30428d6ff95602..b40a5dc09c2c39197b03d8763d323683b4d12262 100644 (file)
--- a/bacula/src/dird/restore.c
+++ b/bacula/src/dird/restore.c
@@ -130,7 +130,7 @@ int do_restore(JCR *jcr)
     *
     */
    Dmsg0(10, "Open connection with storage daemon\n");
-   set_jcr_job_status(jcr, JS_Blocked);
+   set_jcr_job_status(jcr, JS_WaitSD);
    /*
     * Start conversation with Storage daemon  
     */
@@ -157,6 +157,7 @@ int do_restore(JCR *jcr)
    /* 
     * Start conversation with File daemon  
     */
+   set_jcr_job_status(jcr, JS_WaitFD);
    if (!connect_to_file_daemon(jcr, 10, FDConnectTimeout, 1)) {
       restore_cleanup(jcr, JS_ErrorTerminated);
       return 0;
@@ -180,7 +181,6 @@ int do_restore(JCR *jcr)
     *  then wait for File daemon to make connection
     *  with Storage daemon.
     */
-   set_jcr_job_status(jcr, JS_Blocked);
    if (jcr->store->SDDport == 0) {
       jcr->store->SDDport = jcr->store->SDport;
    }
@@ -190,7 +190,6 @@ int do_restore(JCR *jcr)
       restore_cleanup(jcr, JS_ErrorTerminated);
       return 0;
    }
-   set_jcr_job_status(jcr, JS_Running);
 
    /* 
     * Send the bootstrap file -- what Volumes/files to restore