bat: Add restore job list in console

[bacula/bacula] / bacula / src / qt-console / console / console.cpp

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 4201d61ce2c809c224924566a240cdfa61fba290..81fce7c02c75e89a684cce319c0567c9e966ff33 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
 /*
    Bacula® - The Network Backup Solution
 

-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 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.
    This program is Free Software; you can redistribute it and/or
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or

-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public

    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 


@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 

-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License

    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.


@@ -26,8 +26,6 @@
    Switzerland, email:ftf@fsfeurope.org.
 */
 /*
    Switzerland, email:ftf@fsfeurope.org.
 */
 /*

- *   Version $Id$
- *

  *  Console Class
  *
  *   Kern Sibbald, January MMVII
  *  Console Class
  *
  *   Kern Sibbald, January MMVII


@@ -50,6 +48,10 @@ Console::Console(QTabWidget *parent)
    m_console = this;
    m_warningPrevent = false;
    m_dircommCounter = 0;
    m_console = this;
    m_warningPrevent = false;
    m_dircommCounter = 0;

+
+   /* 
+    * Create a connection to the Director and put it in a hash table
+    */

    m_dircommHash.insert(m_dircommCounter, new DirComm(this, m_dircommCounter));
 
    setupUi(this);
    m_dircommHash.insert(m_dircommCounter, new DirComm(this, m_dircommCounter));
 
    setupUi(this);


@@ -94,10 +96,21 @@ void Console::stopTimer()
 void Console::poll_messages()
 {
    int conn;
 void Console::poll_messages()
 {
    int conn;

-   if (!availableDirComm(conn))
+
+   /* Do not poll if notifier off */
+   if (!mainWin->m_notify) {

       return;
       return;

-   DirComm *dircomm = m_dircommHash.value(conn);
+   }
+
+   /*
+    * Note if we call getDirComm here, we continuously consume
+    *  file descriptors.
+    */
+   if (!findDirComm(conn)) {    /* find a free DirComm */
+      return;                   /* try later */
+   }

 
 

+   DirComm *dircomm = m_dircommHash.value(conn);

    if (mainWin->m_checkMessages && dircomm->m_at_main_prompt && hasFocus() && !mainWin->getWaitState()){
       messagesPending(true);
       dircomm->write(".messages");
    if (mainWin->m_checkMessages && dircomm->m_at_main_prompt && hasFocus() && !mainWin->getWaitState()){
       messagesPending(true);
       dircomm->write(".messages");


@@ -122,8 +135,9 @@ void Console::connect_dir()
    m_textEdit = textEdit;   /* our console screen */
 
    if (dircomm->connect_dir()) {
    m_textEdit = textEdit;   /* our console screen */
 
    if (dircomm->connect_dir()) {

-      if (mainWin->m_connDebug)
+      if (mainWin->m_connDebug) {

          Pmsg1(000, "DirComm 0 Seems to have Connected %s\n", m_dir->name());
          Pmsg1(000, "DirComm 0 Seems to have Connected %s\n", m_dir->name());

+      }

       beginNewCommand(0);
    }
    mainWin->set_status(_("Connected"));
       beginNewCommand(0);
    }
    mainWin->set_status(_("Connected"));


@@ -135,17 +149,13 @@ void Console::connect_dir()
  * A function created to separate out the population of the lists
  * from the Console::connect_dir function
  */
  * A function created to separate out the population of the lists
  * from the Console::connect_dir function
  */

-void Console::populateLists(bool forcenew)
+void Console::populateLists(bool /*forcenew*/)

 {
    int conn;
 {
    int conn;

-   if (forcenew) {
+   if (!getDirComm(conn)) {
+      if (mainWin->m_connDebug) Pmsg0(000, "call newDirComm\n");

       if (!newDirComm(conn)) {
       if (!newDirComm(conn)) {

-         Pmsg1(000, "newDirComm Seems to Failed to create a connection for populateLists %s\n", m_dir->name());
-         return;
-      }
-   } else {
-      if (!availableDirComm(conn)) {
-         Pmsg1(000, "availableDirComm Seems to Failed to find a connection for populateListsi %s\n", m_dir->name());
+         Emsg1(M_ABORT, 0, "Failed to connect to %s for populateLists.\n", m_dir->name());

          return;
       }
    }
          return;
       }
    }


@@ -155,6 +165,7 @@ void Console::populateLists(bool forcenew)
 void Console::populateLists(int conn)
 {
    job_list.clear();
 void Console::populateLists(int conn)
 {
    job_list.clear();

+   restore_list.clear();

    client_list.clear();
    fileset_list.clear();
    messages_list.clear();
    client_list.clear();
    fileset_list.clear();
    messages_list.clear();


@@ -162,7 +173,10 @@ void Console::populateLists(int conn)
    storage_list.clear();
    type_list.clear();
    level_list.clear();
    storage_list.clear();
    type_list.clear();
    level_list.clear();

+   volstatus_list.clear();
+   mediatype_list.clear();

    dir_cmd(conn, ".jobs", job_list);
    dir_cmd(conn, ".jobs", job_list);

+   dir_cmd(conn, ".jobs type=R", restore_list);

    dir_cmd(conn, ".clients", client_list);
    dir_cmd(conn, ".filesets", fileset_list);  
    dir_cmd(conn, ".msgs", messages_list);
    dir_cmd(conn, ".clients", client_list);
    dir_cmd(conn, ".filesets", fileset_list);  
    dir_cmd(conn, ".msgs", messages_list);


@@ -170,6 +184,9 @@ void Console::populateLists(int conn)
    dir_cmd(conn, ".storage", storage_list);
    dir_cmd(conn, ".types", type_list);
    dir_cmd(conn, ".levels", level_list);
    dir_cmd(conn, ".storage", storage_list);
    dir_cmd(conn, ".types", type_list);
    dir_cmd(conn, ".levels", level_list);

+   dir_cmd(conn, ".volstatus", volstatus_list);
+   dir_cmd(conn, ".mediatypes", mediatype_list);
+   dir_cmd(conn, ".locations", location_list);

 
    if (mainWin->m_connDebug) {
       QString dbgmsg = QString("jobs=%1 clients=%2 filesets=%3 msgs=%4 pools=%5 storage=%6 types=%7 levels=%8 conn=%9 %10\n")
 
    if (mainWin->m_connDebug) {
       QString dbgmsg = QString("jobs=%1 clients=%2 filesets=%3 msgs=%4 pools=%5 storage=%6 types=%7 levels=%8 conn=%9 %10\n")


@@ -203,11 +220,11 @@ bool Console::dir_cmd(QString &cmd, QStringList &results)
 bool Console::dir_cmd(const char *cmd, QStringList &results)
 {
    int conn;
 bool Console::dir_cmd(const char *cmd, QStringList &results)
 {
    int conn;

-   if (availableDirComm(conn)) {
+   if (getDirComm(conn)) {

       dir_cmd(conn, cmd, results);
       return true;
    } else {
       dir_cmd(conn, cmd, results);
       return true;
    } else {

-      Pmsg1(000, "dir_cmd Seems to Failed to find a connection %s\n", m_dir->name());
+      Pmsg1(000, "dir_cmd failed to connect to %s\n", m_dir->name());

       return false;
    }
 }
       return false;
    }
 }


@@ -221,6 +238,7 @@ bool Console::dir_cmd(int conn, const char *cmd, QStringList &results)
    mainWin->waitEnter();
    DirComm *dircomm = m_dircommHash.value(conn);
    int stat;
    mainWin->waitEnter();
    DirComm *dircomm = m_dircommHash.value(conn);
    int stat;

+   bool prev_notify = mainWin->m_notify;

 
    if (mainWin->m_connDebug) {
       QString dbgmsg = QString("dir_cmd conn %1 %2 %3\n").arg(conn).arg(m_dir->name()).arg(cmd);
 
    if (mainWin->m_connDebug) {
       QString dbgmsg = QString("dir_cmd conn %1 %2 %3\n").arg(conn).arg(m_dir->name()).arg(cmd);


@@ -234,10 +252,12 @@ bool Console::dir_cmd(int conn, const char *cmd, QStringList &results)
       results << dircomm->msg();
    }
    if (stat > 0 && mainWin->m_displayAll) display_text(dircomm->msg());
       results << dircomm->msg();
    }
    if (stat > 0 && mainWin->m_displayAll) display_text(dircomm->msg());

-   notify(conn, true);
+   if (prev_notify) {
+      notify(conn, true);         /* turn it back on */
+   }

    discardToPrompt(conn);
    mainWin->waitExit();
    discardToPrompt(conn);
    mainWin->waitExit();

-   return true;              /* ***FIXME*** return any command error */
+   return true;                  /* ***FIXME*** return any command error */

 }
 
 /*
 }
 
 /*


@@ -251,16 +271,18 @@ bool Console::sql_cmd(int &conn, QString &query, QStringList &results)
 bool Console::sql_cmd(QString &query, QStringList &results)
 {
    int conn;
 bool Console::sql_cmd(QString &query, QStringList &results)
 {
    int conn;

-   if (!availableDirComm(conn))
+   if (!getDirComm(conn)) {

       return false;
       return false;

+   }

    return sql_cmd(conn, query.toUtf8().data(), results, true);
 }
 
 bool Console::sql_cmd(const char *query, QStringList &results)
 {
    int conn;
    return sql_cmd(conn, query.toUtf8().data(), results, true);
 }
 
 bool Console::sql_cmd(const char *query, QStringList &results)
 {
    int conn;

-   if (!availableDirComm(conn))
+   if (!getDirComm(conn)) {

       return false;
       return false;

+   }

    return sql_cmd(conn, query, results, true);
 }
 
    return sql_cmd(conn, query, results, true);
 }
 


@@ -273,15 +295,16 @@ bool Console::sql_cmd(int &conn, const char *query, QStringList &results, bool d
    DirComm *dircomm = m_dircommHash.value(conn);
    int stat;
    POOL_MEM cmd(PM_MESSAGE);
    DirComm *dircomm = m_dircommHash.value(conn);
    int stat;
    POOL_MEM cmd(PM_MESSAGE);

+   bool prev_notify = mainWin->m_notify;

 
    if (!is_connectedGui()) {
       return false;
    }
 
 
    if (!is_connectedGui()) {
       return false;
    }
 

-   if (mainWin->m_connDebug)
-      Pmsg2(000, "sql_cmd conn %i %s\n", conn, query);
-   if (donotify)
+   if (mainWin->m_connDebug) Pmsg2(000, "sql_cmd conn %i %s\n", conn, query);
+   if (donotify) {

       dircomm->notify(false);
       dircomm->notify(false);

+   }

    mainWin->waitEnter();
    
    pm_strcpy(cmd, ".sql query=\"");
    mainWin->waitEnter();
    
    pm_strcpy(cmd, ".sql query=\"");


@@ -300,15 +323,17 @@ bool Console::sql_cmd(int &conn, const char *query, QStringList &results, bool d
          QString dum = dircomm->msg();
          if ((dum.left(6) == "*None*")) doappend = false;
       }
          QString dum = dircomm->msg();
          if ((dum.left(6) == "*None*")) doappend = false;
       }

-      if (doappend)
+      if (doappend) {

          results << dircomm->msg();
          results << dircomm->msg();

+      }

       first = false;
    }
       first = false;
    }

-   if (donotify)
+   if (donotify && prev_notify) {

       dircomm->notify(true);
       dircomm->notify(true);

+   }

    discardToPrompt(conn);
    mainWin->waitExit();
    discardToPrompt(conn);
    mainWin->waitExit();

-   return true;              /* ***FIXME*** return any command error */
+   return !mainWin->isClosing();      /* return false if closing */

 }
 
 /* 
 }
 
 /* 


@@ -318,16 +343,18 @@ bool Console::sql_cmd(int &conn, const char *query, QStringList &results, bool d
 int Console::write_dir(const char *msg)
 {
    int conn;
 int Console::write_dir(const char *msg)
 {
    int conn;

-   if (availableDirComm(conn))
+   if (getDirComm(conn)) {

       write_dir(conn, msg);
       write_dir(conn, msg);

+   }

    return conn;
 }
 
 int Console::write_dir(const char *msg, bool dowait)
 {
    int conn;
    return conn;
 }
 
 int Console::write_dir(const char *msg, bool dowait)
 {
    int conn;

-   if (availableDirComm(conn))
+   if (getDirComm(conn)) {

       write_dir(conn, msg, dowait);
       write_dir(conn, msg, dowait);

+   }

    return conn;
 }
 
    return conn;
 }
 


@@ -384,9 +411,12 @@ bool Console::get_job_defaults(int &conn, struct job_defaults &job_defs, bool do
    QString scmd;
    int stat;
    char *def;
    QString scmd;
    int stat;
    char *def;

+   bool prev_notify = mainWin->m_notify;
+   bool rtn = false;

 
 

-   if (donotify)
+   if (donotify) {

       conn = notifyOff();
       conn = notifyOff();

+   }

    beginNewCommand(conn);
    DirComm *dircomm = m_dircommHash.value(conn);
    bool prevWaitState = mainWin->getWaitState();
    beginNewCommand(conn);
    DirComm *dircomm = m_dircommHash.value(conn);
    bool prevWaitState = mainWin->getWaitState();


@@ -453,19 +483,16 @@ bool Console::get_job_defaults(int &conn, struct job_defaults &job_defs, bool do
          continue;
       }
    }
          continue;
       }
    }

-
-   if (donotify)
-      notify(conn, true);
-   if (!prevWaitState)
-      mainWin->waitExit();
-   return true;
-
+   rtn = true;
+   /* Fall through wanted */

 bail_out:
 bail_out:

-   if (donotify)
+   if (donotify && prev_notify) {

       notify(conn, true);
       notify(conn, true);

-   if (!prevWaitState)
+   }
+   if (!prevWaitState) {

       mainWin->waitExit();
       mainWin->waitExit();

-   return false;
+   }
+   return rtn;

 }
 
 
 }
 
 


@@ -634,7 +661,9 @@ void Console::discardToPrompt(int conn)
          }
       }
    }
          }
       }
    }

-   if (mainWin->m_commDebug) Pmsg2(000, "endDiscardToPrompt=%d %s\n", stat, m_dir->name());
+   if (mainWin->m_commDebug) {
+      Pmsg2(000, "endDiscardToPrompt conn=%i %s\n", conn, m_dir->name());
+   }

 }
 
 QString Console::returnFromPrompt(int conn)
 }
 
 QString Console::returnFromPrompt(int conn)


@@ -644,6 +673,8 @@ QString Console::returnFromPrompt(int conn)
 
    int stat = 0;
    text = "";
 
    int stat = 0;
    text = "";

+   dircomm->read();
+   text += dircomm->msg();

    if (mainWin->m_commDebug) Pmsg1(000, "returnFromPrompt %s\n", m_dir->name());
    while (!dircomm->m_at_prompt) {
       if ((stat=dircomm->read()) > 0) {
    if (mainWin->m_commDebug) Pmsg1(000, "returnFromPrompt %s\n", m_dir->name());
    while (!dircomm->m_at_prompt) {
       if ((stat=dircomm->read()) > 0) {


@@ -665,12 +696,13 @@ QString Console::returnFromPrompt(int conn)
  *    m_console->notifiy(false);
  */
 
  *    m_console->notifiy(false);
  */
 

-/* dual purpose function to turn notify off and return an available connection */
+/* dual purpose function to turn notify off and return a connection */

 int Console::notifyOff()
 { 
    int conn = 0;
 int Console::notifyOff()
 { 
    int conn = 0;

-   if (availableDirComm(conn))
+   if (getDirComm(conn)) {

       notify(conn, false);
       notify(conn, false);

+   }

    return conn;
 }
 
    return conn;
 }
 


@@ -810,38 +842,44 @@ bool Console::is_connected(int conn)
 }
 
 /*
 }
 
 /*

- * Need an available connection.  Check existing connections or create one
+ * Need a connection.  Check existing connections or create one

  */
  */

-bool Console::availableDirComm(int &conn)
+bool Console::getDirComm(int &conn)

 {
 {

-   QHash<int, DirComm*>::const_iterator iter = m_dircommHash.constBegin();
-   while (iter != m_dircommHash.constEnd()) {
-      DirComm *dircomm = iter.value();
-      if (dircomm->m_at_prompt && dircomm->m_at_main_prompt && dircomm->is_notify_enabled()) {
-         conn = dircomm->m_conn;
-         return true;
-      }
-      ++iter;
-   }
-   if (newDirComm(conn))
+   if (findDirComm(conn)) {

       return true;
       return true;

-   else
-      return false;
+   }
+   if (mainWin->m_connDebug) Pmsg0(000, "call newDirComm\n");
+   return newDirComm(conn);

 }
 
 
 /*
 }
 
 
 /*

- * Need current connection.
+ * Try to find a free (unused but established) connection
+ * KES: Note, I think there is a problem here because for
+ *   some reason, the notifier is often turned off on file  
+ *   descriptors that seem to me to be available.  That means
+ *   that we do not use a free descriptor and thus we will create
+ *   a new connection that is maybe not necessary.  Someone needs
+ *   to look into whether or not notify() is correctly turned on
+ *   when we are back at the command prompt and idle.
+ *                         

  */
  */

-bool Console::currentDirComm(int &conn)
+bool Console::findDirComm(int &conn)

 {
 {

+   int i = 1;

    QHash<int, DirComm*>::const_iterator iter = m_dircommHash.constBegin();
    while (iter != m_dircommHash.constEnd()) {
       DirComm *dircomm = iter.value();
    QHash<int, DirComm*>::const_iterator iter = m_dircommHash.constBegin();
    while (iter != m_dircommHash.constEnd()) {
       DirComm *dircomm = iter.value();

-      if (dircomm->m_at_prompt && !dircomm->m_at_main_prompt && dircomm->is_notify_enabled()) {
+      if (dircomm->m_at_prompt && dircomm->m_at_main_prompt && dircomm->is_notify_enabled()) {

          conn = dircomm->m_conn;
          return true;
       }
          conn = dircomm->m_conn;
          return true;
       }

+      if (mainWin->m_connDebug) {
+         Pmsg4(000, "currentDirComm=%d at_prompt=%d at_main=%d && notify=%d\n",                                      
+            i, dircomm->m_at_prompt, dircomm->m_at_main_prompt, dircomm->is_notify_enabled());
+         i++;
+      }

       ++iter;
    }
    return false;
       ++iter;
    }
    return false;


@@ -852,18 +890,26 @@ bool Console::currentDirComm(int &conn)
  */
 bool Console::newDirComm(int &conn)
 {
  */
 bool Console::newDirComm(int &conn)
 {

-   m_dircommCounter += 1;
-   conn = m_dircommCounter;
-   if (mainWin->m_connDebug)
-      Pmsg2(000, "DirComm %i About to Create and Connect %s\n", m_dircommCounter, m_dir->name());
+   m_dircommCounter++;
+   if (mainWin->m_connDebug) {
+      Pmsg2(000, "newDirComm=%i to: %s\n", m_dircommCounter, m_dir->name());
+   }

    DirComm *dircomm = new DirComm(this, m_dircommCounter);
    m_dircommHash.insert(m_dircommCounter, dircomm);
    bool success = dircomm->connect_dir();
    if (mainWin->m_connDebug) {
    DirComm *dircomm = new DirComm(this, m_dircommCounter);
    m_dircommHash.insert(m_dircommCounter, dircomm);
    bool success = dircomm->connect_dir();
    if (mainWin->m_connDebug) {

-      if (success)
-         Pmsg2(000, "DirComm %i Connected %s\n", conn, m_dir->name());
-      else
-         Pmsg2(000, "DirComm %i NOT Connected %s\n", conn, m_dir->name());
+      if (success) {
+         Pmsg2(000, "newDirComm=%i Connected %s\n", m_dircommCounter, m_dir->name());
+      } else {
+         Emsg2(M_ERROR, 0, "DirComm=%i. Unable to connect to %s\n",
+               m_dircommCounter, m_dir->name());
+      }
+   }
+   if (!success) {
+      m_dircommHash.remove(m_dircommCounter);
+      delete dircomm;
+      m_dircommCounter--;

    }
    }

+   conn = m_dircommCounter;

    return success;
 }
    return success;
 }