kes Improve plugin debug. Create plugin test.

kes  Set main thread specific data to INVALID because it
     has no jcr. This allows debug output to work correctly.

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

diff --git a/bacula/src/filed/fd_plugins.c b/bacula/src/filed/fd_plugins.c
index 135c2fbeddb2090a5ba5b94c09bf2d2451f52d89..596c372bbc1cdabc22f4ed733b6aefb739e99a77 100644 (file)
--- a/bacula/src/filed/fd_plugins.c
+++ b/bacula/src/filed/fd_plugins.c
@@ -148,7 +148,7 @@ int plugin_save(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
    event.eventType = bEventBackupCommand;
 
    /* Handle plugin command here backup */
-   Dmsg1(100, "plugin cmd=%s\n", cmd);
+   Dmsg1(dbglvl, "plugin cmd=%s\n", cmd);
    if (!(p = strchr(cmd, ':'))) {
       Jmsg1(jcr, M_ERROR, 0, "Malformed plugin command: %s\n", cmd);
       goto bail_out;
@@ -159,12 +159,12 @@ int plugin_save(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
    }
 
    foreach_alist(plugin, plugin_list) {
-      Dmsg3(100, "plugin=%s cmd=%s len=%d\n", plugin->file, cmd, len);
+      Dmsg3(dbglvl, "plugin=%s cmd=%s len=%d\n", plugin->file, cmd, len);
       if (strncmp(plugin->file, cmd, len) != 0) {
          i++;
          continue;
       }
-      Dmsg1(100, "Command plugin = %s\n", cmd);
+      Dmsg1(dbglvl, "Command plugin = %s\n", cmd);
       /* Send the backup command */
       if (plug_func(plugin)->handlePluginEvent(&plugin_ctx_list[i], &event, cmd) != bRC_OK) {
          goto bail_out;
@@ -175,7 +175,7 @@ int plugin_save(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
          sp.type = FT_REG;
          sp.portable = true;
          sp.cmd = cmd;
-         Dmsg3(000, "startBackup st_size=%p st_blocks=%p sp=%p\n", &sp.statp.st_size, &sp.statp.st_blocks,
+         Dmsg3(dbglvl, "startBackup st_size=%p st_blocks=%p sp=%p\n", &sp.statp.st_size, &sp.statp.st_blocks,
                 &sp);
          /* Get the file save parameters */
          if (plug_func(plugin)->startBackupFile(&plugin_ctx_list[i], &sp) != bRC_OK) {
@@ -188,7 +188,7 @@ int plugin_save(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
          ff_pkt->fname = sp.fname;
          ff_pkt->type = sp.type;
          memcpy(&ff_pkt->statp, &sp.statp, sizeof(ff_pkt->statp));
-         Dmsg1(000, "Save_file: file=%s\n", ff_pkt->fname);
+         Dmsg1(dbglvl, "Save_file: file=%s\n", ff_pkt->fname);
          save_file(jcr, ff_pkt, true);
          if (plug_func(plugin)->endBackupFile(&plugin_ctx_list[i]) != bRC_More) {
             goto bail_out;
@@ -209,7 +209,7 @@ bool send_plugin_name(JCR *jcr, BSOCK *sd, bool start)
    int stat;
    struct save_pkt *sp = (struct save_pkt *)jcr->plugin_sp;
   
-   Dmsg1(000, "send_plugin_name=%s\n", sp->cmd);
+   Dmsg1(dbglvl, "send_plugin_name=%s\n", sp->cmd);
    /* Send stream header */
    if (!sd->fsend("%ld %d 0", jcr->JobFiles+1, STREAM_PLUGIN_NAME)) {
      Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
@@ -230,7 +230,7 @@ bool send_plugin_name(JCR *jcr, BSOCK *sd, bool start)
             sd->bstrerror());
          return false;
    }
-   Dmsg1(000, "send: %s\n", sd->msg);
+   Dmsg1(dbglvl, "send: %s\n", sd->msg);
    sd->signal(BNET_EOD);            /* indicate end of plugin name data */
    return true;
 }
@@ -252,7 +252,7 @@ void plugin_name_stream(JCR *jcr, char *name)
       goto bail_out;
    }
 
-   Dmsg1(100, "Read plugin stream string=%s\n", name);
+   Dmsg1(dbglvl, "Read plugin stream string=%s\n", name);
    skip_nonspaces(&p);             /* skip over jcr->JobFiles */
    skip_spaces(&p);
    start = *p == '1';
@@ -279,7 +279,7 @@ void plugin_name_stream(JCR *jcr, char *name)
     * After this point, we are dealing with a restore start
     */
 
-   Dmsg1(100, "plugin restore cmd=%s\n", cmd);
+   Dmsg1(dbglvl, "plugin restore cmd=%s\n", cmd);
    if (!(p = strchr(cmd, ':'))) {
       Jmsg1(jcr, M_ERROR, 0, "Malformed plugin command: %s\n", cmd);
       goto bail_out;
@@ -294,12 +294,12 @@ void plugin_name_stream(JCR *jcr, char *name)
     */
    foreach_alist(plugin, plugin_list) {
       bEvent event;
-      Dmsg3(100, "plugin=%s cmd=%s len=%d\n", plugin->file, cmd, len);
+      Dmsg3(dbglvl, "plugin=%s cmd=%s len=%d\n", plugin->file, cmd, len);
       if (strncmp(plugin->file, cmd, len) != 0) {
          i++;
          continue;
       }
-      Dmsg1(100, "Restore Command plugin = %s\n", cmd);
+      Dmsg1(dbglvl, "Restore Command plugin = %s\n", cmd);
       event.eventType = bEventRestoreCommand;     
       if (plug_func(plugin)->handlePluginEvent(&plugin_ctx_list[i], 
             &event, cmd) != bRC_OK) {
@@ -378,6 +378,7 @@ void load_fd_plugins(const char *plugin_dir)
    Plugin *plugin;
 
    if (!plugin_dir) {
+      Dmsg0(dbglvl, "plugin dir is NULL\n");
       return;
    }
 
@@ -387,6 +388,7 @@ void load_fd_plugins(const char *plugin_dir)
       if (plugin_list->size() == 0) {
          delete plugin_list;
          plugin_list = NULL;
+         Dmsg0(dbglvl, "No plugins loaded\n");
          return;
       }
    }
@@ -399,6 +401,8 @@ void load_fd_plugins(const char *plugin_dir)
    plugin_blseek = my_plugin_blseek;
    foreach_alist(plugin, plugin_list) {
       Jmsg(NULL, M_INFO, 0, _("Loaded plugin: %s\n"), plugin->file);
+      Dmsg1(dbglvl, "Loaded plugin: %s\n", plugin->file);
+
    }
 
 }
@@ -414,12 +418,14 @@ void new_plugins(JCR *jcr)
    int i = 0;
 
    if (!plugin_list) {
+      Dmsg0(dbglvl, "plugin list is NULL\n");
       return;
    }
 
    int num = plugin_list->size();
 
    if (num == 0) {
+      Dmsg0(dbglvl, "No plugins loaded\n");
       return;
    }
 
@@ -462,7 +468,7 @@ static int my_plugin_bopen(JCR *jcr, const char *fname, int flags, mode_t mode)
    Plugin *plugin = (Plugin *)jcr->plugin;
    bpContext *plugin_ctx = (bpContext *)jcr->plugin_ctx;
    struct io_pkt io;
-   Dmsg0(000, "plugin_bopen\n");
+   Dmsg0(dbglvl, "plugin_bopen\n");
    io.func = IO_OPEN;
    io.count = 0;
    io.buf = NULL;
@@ -477,7 +483,7 @@ static int my_plugin_bclose(JCR *jcr)
    Plugin *plugin = (Plugin *)jcr->plugin;
    bpContext *plugin_ctx = (bpContext *)jcr->plugin_ctx;
    struct io_pkt io;
-   Dmsg0(000, "plugin_bclose\n");
+   Dmsg0(dbglvl, "plugin_bclose\n");
    io.func = IO_CLOSE;
    io.count = 0;
    io.buf = NULL;
@@ -490,7 +496,7 @@ static ssize_t my_plugin_bread(JCR *jcr, void *buf, size_t count)
    Plugin *plugin = (Plugin *)jcr->plugin;
    bpContext *plugin_ctx = (bpContext *)jcr->plugin_ctx;
    struct io_pkt io;
-   Dmsg0(000, "plugin_bread\n");
+   Dmsg0(dbglvl, "plugin_bread\n");
    io.func = IO_READ;
    io.count = count;
    io.buf = (char *)buf;
@@ -503,7 +509,7 @@ static ssize_t my_plugin_bwrite(JCR *jcr, void *buf, size_t count)
    Plugin *plugin = (Plugin *)jcr->plugin;
    bpContext *plugin_ctx = (bpContext *)jcr->plugin_ctx;
    struct io_pkt io;
-   Dmsg0(000, "plugin_bwrite\n");
+   Dmsg0(dbglvl, "plugin_bwrite\n");
    io.func = IO_WRITE;
    io.count = count;
    io.buf = (char *)buf;
@@ -516,7 +522,7 @@ static boffset_t my_plugin_blseek(JCR *jcr, boffset_t offset, int whence)
    Plugin *plugin = (Plugin *)jcr->plugin;
    bpContext *plugin_ctx = (bpContext *)jcr->plugin_ctx;
    struct io_pkt io;
-   Dmsg0(000, "plugin_bseek\n");
+   Dmsg0(dbglvl, "plugin_bseek\n");
    io.func = IO_SEEK;
    io.offset = offset;
    io.whence = whence;

diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h
index 6fa98ab276400ba7af7c012d309971cbb1ba17c8..1beb79e91d51cd742c62a1c18a18e2e203c3b3a7 100644 (file)
--- a/bacula/src/jcr.h
+++ b/bacula/src/jcr.h
@@ -410,6 +410,15 @@ public:
 
 };
 
+/*
+ * Setting a NULL in tsd doesn't clear the tsd but instead tells
+ *   pthreads not to call the tsd destructor. Consequently, we 
+ *   define this *invalid* jcr address and stuff it in the tsd
+ *   when the jcr is not valid.
+ */
+#define INVALID_JCR ((JCR *)(-1))
+
+
 /*
  * Structure for all daemons that keeps some summary
  *  info on the last job run.

diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index 7b2231ded0fd09e17eb23044db383bc861061582..ca961db1cac0b7e654e8e14da2362c66071f2fe1 100644 (file)
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -55,14 +55,6 @@
 
 const int dbglvl = 3400;
 
-/*
- * Setting a NULL in tsd doesn't clear the tsd but instead tells
- *   pthreads not to call the tsd destructor. Consequently, we 
- *   define this *invalid* jcr address and stuff it in the tsd
- *   when the jcr is no longer valid.
- */
-#define INVALID_JCR ((JCR *)(-1))
-
 /* External variables we reference */
 extern time_t watchdog_time;
 

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index ecf5945c9c4d60a2feb67c8ed421c7261eea7982..85ba0b6d050ac34501e248d9754ade5d859e3dc3 100644 (file)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -65,7 +65,7 @@ brwlock_t con_lock;                   /* Console lock structure */
 /* Forward referenced functions */
 
 /* Imported functions */
-
+void create_jcr_key();
 
 /* Static storage */
 
@@ -188,6 +188,10 @@ init_msg(JCR *jcr, MSGS *msg)
 
    if (jcr == NULL && msg == NULL) {
       init_last_jobs_list();
+      /* Create a daemon key then set invalid jcr */
+      /* Maybe we should give the daemon a jcr??? */
+      create_jcr_key();
+      set_jcr_in_tsd(INVALID_JCR);
    }
 
 #if !defined(HAVE_WIN32)

diff --git a/bacula/src/lib/plugins.c b/bacula/src/lib/plugins.c
index 599e5dea8454972b4405d226efb2e7771431709f..2a135dd470b289d50f3669315ddb7e2894743122 100644 (file)
--- a/bacula/src/lib/plugins.c
+++ b/bacula/src/lib/plugins.c
@@ -33,6 +33,8 @@
 #include "bacula.h"
 #include "plugins.h"
 
+static const int dbglvl = 50;
+
 /* All loaded plugins */
 alist *plugin_list = NULL;
 
@@ -78,6 +80,8 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir, const char
       berrno be;
       Jmsg(NULL, M_ERROR_TERM, 0, _("Failed to open Plugin directory %s: ERR=%s\n"), 
             plugin_dir, be.bstrerror());
+      Dmsg2(dbglvl, "Failed to open Plugin directory %s: ERR=%s\n", 
+            plugin_dir, be.bstrerror());
       goto get_out;
    }
    
@@ -91,6 +95,7 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir, const char
          if (!found) {
             Jmsg(NULL, M_WARNING, 0, _("Failed to find any plugins in %s\n"), 
                   plugin_dir);
+            Dmsg1(dbglvl, "Failed to find any plugins in %s\n", plugin_dir);
          }
          break;
       }
@@ -102,10 +107,10 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir, const char
       len = strlen(result->d_name);
       type_len = strlen(type);
       if (len < type_len+1 || strcmp(&result->d_name[len-type_len], type) != 0) {
-         Dmsg3(100, "Rejected plugin: want=%s name=%s len=%d\n", type, result->d_name, len);
+         Dmsg3(dbglvl, "Rejected plugin: want=%s name=%s len=%d\n", type, result->d_name, len);
          continue;
       }
-      Dmsg2(100, "Loaded plugin: name=%s len=%d\n", result->d_name, len);
+      Dmsg2(dbglvl, "Loaded plugin: name=%s len=%d\n", result->d_name, len);
        
       pm_strcpy(fname, plugin_dir);
       if (need_slash) {
@@ -122,6 +127,8 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir, const char
       if (!plugin->pHandle) {
          Jmsg(NULL, M_ERROR, 0, _("Plugin load %s failed: ERR=%s\n"), 
               fname.c_str(), NPRT(dlerror()));
+         Dmsg2(dbglvl, "Plugin load %s failed: ERR=%s\n", fname.c_str(), 
+               NPRT(dlerror()));
          goto get_out;
       }
 
@@ -130,12 +137,16 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir, const char
       if (!loadPlugin) {
          Jmsg(NULL, M_ERROR, 0, _("Lookup of loadPlugin in plugin %s failed: ERR=%s\n"),
             fname.c_str(), NPRT(dlerror()));
+         Dmsg2(dbglvl, "Lookup of loadPlugin in plugin %s failed: ERR=%s\n", 
+            fname.c_str(), NPRT(dlerror()));
          goto get_out;
       }
       plugin->unloadPlugin = (t_unloadPlugin)dlsym(plugin->pHandle, "unloadPlugin");
       if (!plugin->unloadPlugin) {
          Jmsg(NULL, M_ERROR, 0, _("Lookup of unloadPlugin in plugin %s failed: ERR=%s\n"),
             fname.c_str(), NPRT(dlerror()));
+         Dmsg2(dbglvl, "Lookup of unloadPlugin in plugin %s failed: ERR=%s\n",
+            fname.c_str(), NPRT(dlerror()));
          goto get_out;
       }
 

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 07024eff73145846d063af8bec826db5b99e49ba..d051c7b8f0bd2810852fb9fdc6825d51c223e656 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -19,6 +19,9 @@ remove reader/writer in FOPTS????
 
 General:
 25Sep08
+kes  Improve plugin debug. Create plugin test.
+kes  Set main thread specific data to INVALID because it
+     has no jcr. This allows debug output to work correctly.
 kes  Add src/plugins/fd/Makefile to ./configure process.
 kes  Make first cut attempt to correct SQL that computes the current
      Pool usage.  This is to fix bug #1159.