metaplugin: Fix regression at endjob procedure.

diff --git a/bacula/src/plugins/fd/pluginlib/metaplugin.cpp b/bacula/src/plugins/fd/pluginlib/metaplugin.cpp
index 38de8ea033838b7ed60d26b55c14cf91981a024b..f6faf29cc958165ddb5e4186ad6ca744ebb5fcc1 100644 (file)
--- a/bacula/src/plugins/fd/pluginlib/metaplugin.cpp
+++ b/bacula/src/plugins/fd/pluginlib/metaplugin.cpp
@@ -508,35 +508,6 @@ bRC METAPLUGIN::run_backend(bpContext *ctx)
    return bRC_OK;
 }
 
-/*
- * Terminates the current backend pointed by backendctx context.
- *    The termination sequence consist of "End Job" protocol procedure and real
- *    backend process termination including communication channel close.
- *    When we'll get an error during "End Job" procedure then we inform the user
- *    and terminate the backend as usual without unnecessary formalities. :)
- *
- * in:
- *    bpContext - for Bacula debug and jobinfo messages
- * out:
- *    bRC_OK - when backend termination was successful, i.e. no error in
- *             "End Job" procedure
- *    bRC_Error - when backend termination encountered an error.
- */
-bRC METAPLUGIN::terminate_current_backend(bpContext *ctx)
-{
-   bRC status = bRC_OK;
-
-   if (send_endjob(ctx) != bRC_OK){
-      /* error in end job */
-      DMSG0(ctx, DERROR, "Error in EndJob.\n");
-      status = bRC_Error;
-   }
-   int pid = backend.ctx->get_backend_pid();
-   DMSG(ctx, DINFO, "Terminate backend at PID=%d\n", pid)
-   backend.ctx->terminate(ctx);
-   return status;
-}
-
 bRC backendctx_finish_func(PTCOMM *ptcomm, void *cp)
 {
    bpContext * ctx = (bpContext*)cp;
@@ -569,10 +540,67 @@ bRC METAPLUGIN::signal_finish_all_backends(bpContext *ctx)
    return backend.foreach_command_status(backendctx_finish_func, ctx);
 }
 
-void backendctx_jobend_func(PTCOMM *ptcomm, void *cp)
+/*
+ * Send end job command to backend.
+ *    It terminates the backend when command sending was unsuccessful, as it is
+ *    the very last procedure in protocol.
+ *
+ * in:
+ *    bpContext - for Bacula debug and jobinfo messages
+ *    ptcomm - backend context
+ * out:
+ *    bRC_OK - when send command was successful
+ *    bRC_Error - on any error
+ */
+bRC send_endjob(bpContext *ctx, PTCOMM *ptcomm)
+{
+   bRC status = bRC_OK;
+   POOL_MEM cmd(PM_FNAME);
+   pm_strcpy(cmd, "END\n");
+
+   if (ptcomm->write_command(ctx, cmd.c_str()) < 0){
+      /* error */
+      status = bRC_Error;
+   } else {
+      if (!ptcomm->read_ack(ctx)){
+         DMSG0(ctx, DERROR, "Wrong backend response to JobEnd command.\n");
+         JMSG0(ctx, ptcomm->jmsg_err_level(), "Wrong backend response to JobEnd command.\n");
+         status = bRC_Error;
+      }
+      ptcomm->signal_term(ctx);
+   }
+   return status;
+}
+
+/*
+ * Terminates the current backend pointed by ptcomm context.
+ *    The termination sequence consist of "End Job" protocol procedure and real
+ *    backend process termination including communication channel close.
+ *    When we'll get an error during "End Job" procedure then we inform the user
+ *    and terminate the backend as usual without unnecessary formalities. :)
+ *
+ * in:
+ *    bpContext - for Bacula debug and jobinfo messages
+ * out:
+ *    bRC_OK - when backend termination was successful, i.e. no error in
+ *             "End Job" procedure
+ *    bRC_Error - when backend termination encountered an error.
+ */
+bRC backendctx_jobend_func(PTCOMM *ptcomm, void *cp)
 {
-   // bpContext * ctx = (bpContext*)cp;
-   // ptcomm->disconnect_xenapi(ctx);
+   bpContext * ctx = (bpContext*)cp;
+   bRC status = bRC_OK;
+
+   if (send_endjob(ctx, ptcomm) != bRC_OK){
+      /* error in end job */
+      DMSG0(ctx, DERROR, "Error in EndJob.\n");
+      status = bRC_Error;
+   }
+   int pid = ptcomm->get_backend_pid();
+   DMSG(ctx, DINFO, "Terminate backend at PID=%d\n", pid)
+   ptcomm->terminate(ctx);
+
+   return status;
 }
 
 /*
@@ -587,11 +615,7 @@ void backendctx_jobend_func(PTCOMM *ptcomm, void *cp)
  */
 bRC METAPLUGIN::terminate_all_backends(bpContext *ctx)
 {
-   bRC status = bRC_OK;
-
-   backend.foreach_command(backendctx_jobend_func, ctx);
-
-   return status;
+   return backend.foreach_command_status(backendctx_jobend_func, ctx);
 }
 
 /*
@@ -709,7 +733,7 @@ bRC METAPLUGIN::send_jobinfo(bpContext *ctx, char type)
 
    if (!backend.ctx->read_ack(ctx)){
       DMSG0(ctx, DERROR, "Wrong backend response to Job command.\n");
-      JMSG0(ctx, backend.ctx->is_fatal() ? M_FATAL : M_ERROR, "Wrong backend response to Job command.\n");
+      JMSG0(ctx, backend.ctx->jmsg_err_level(), "Wrong backend response to Job command.\n");
       status = bRC_Error;
    }
 
@@ -819,7 +843,7 @@ bRC METAPLUGIN::send_parameters(bpContext *ctx, char *command)
    /* ack Params command */
    if (!backend.ctx->read_ack(ctx)){
       DMSG0(ctx, DERROR, "Wrong backend response to Params command.\n");
-      JMSG0(ctx, backend.ctx->is_fatal() ? M_FATAL : M_ERROR, "Wrong backend response to Params command.\n");
+      JMSG0(ctx, backend.ctx->jmsg_err_level(), "Wrong backend response to Params command.\n");
       status = bRC_Error;
    }
 
@@ -842,64 +866,21 @@ bailout:
  */
 bRC METAPLUGIN::send_startjob(bpContext *ctx, const char *command)
 {
-   int32_t rc;
-   int len;
-   bRC status = bRC_OK;
-   POOLMEM *cmd;
-
-   cmd = get_pool_memory(PM_FNAME);
-   len = sizeof_pool_memory(cmd);
+   POOL_MEM cmd;
 
-   bsnprintf(cmd, len, command);
-   rc = backend.ctx->write_command(ctx, cmd);
-   if (rc < 0){
+   pm_strcpy(cmd, command);
+   if (backend.ctx->write_command(ctx, cmd) < 0){
       /* error */
-      status = bRC_Error;
-      goto bailout;
+      return bRC_Error;
    }
 
    if (!backend.ctx->read_ack(ctx)){
       DMSG(ctx, DERROR, "Wrong backend response to %s command.\n", command);
-      JMSG(ctx, backend.ctx->is_fatal() ? M_FATAL : M_ERROR, "Wrong backend response to %s command.\n", command);
-      status = bRC_Error;
+      JMSG(ctx, backend.ctx->jmsg_err_level(), "Wrong backend response to %s command.\n", command);
+      return bRC_Error;
    }
 
-bailout:
-   free_pool_memory(cmd);
-   return status;
-}
-
-/*
- * Send end job command to backend.
- *    It terminates the backend when command sending was unsuccessful, as it is
- *    the very last procedure in protocol.
- *
- * in:
- *    bpContext - for Bacula debug and jobinfo messages
- * out:
- *    bRC_OK - when send command was successful
- *    bRC_Error - on any error
- */
-bRC METAPLUGIN::send_endjob(bpContext *ctx)
-{
-   int32_t rc;
-   bRC status = bRC_OK;
-   POOL_MEM cmd(PM_FNAME);
-
-   bsnprintf(cmd.c_str(), cmd.size(), "END\n");
-   rc = backend.ctx->write_command(ctx, cmd.c_str());
-   if (rc < 0){
-      /* error */
-      status = bRC_Error;
-   } else {
-      if (!backend.ctx->read_ack(ctx)){
-         DMSG0(ctx, DERROR, "Wrong backend response to JobEnd command.\n");
-         JMSG0(ctx, backend.ctx->is_fatal() ? M_FATAL : M_ERROR, "Wrong backend response to JobEnd command.\n");
-         status = bRC_Error;
-      }
-      backend.ctx->signal_term(ctx);
-   }
-   return status;
+   return bRC_OK;
 }
 
 /*
@@ -973,7 +954,7 @@ bRC METAPLUGIN::send_startrestore(bpContext *ctx)
 
    if (backend.ctx->read_command(ctx, cmd) < 0){
       DMSG(ctx, DERROR, "Wrong backend response to %s command.\n", command);
-      JMSG(ctx, backend.ctx->is_fatal() ? M_FATAL : M_ERROR, "Wrong backend response to %s command.\n", command);
+      JMSG(ctx, backend.ctx->jmsg_err_level(), "Wrong backend response to %s command.\n", command);
       return bRC_Error;
    }
    if (backend.ctx->is_eod()){
@@ -2023,7 +2004,7 @@ bRC METAPLUGIN::endBackupFile(bpContext *ctx)
       }
    }
 
-   // check for next file onnly when no previous error
+   // check for next file only when no previous error
    if (!openerror)
    {
       if (estimate)
@@ -2130,7 +2111,7 @@ bRC METAPLUGIN::createFile(bpContext *ctx, struct restore_pkt *rp)
          rp->create_status = CF_SKIP;
       } else {
          DMSG(ctx, DERROR, "Wrong backend response to create file, got: %s\n", cmd.c_str());
-         JMSG(ctx, backend.ctx->is_fatal() ? M_FATAL : M_ERROR, "Wrong backend response to create file, got: %s\n", cmd.c_str());
+         JMSG(ctx, backend.ctx->jmsg_err_level(), "Wrong backend response to create file, got: %s\n", cmd.c_str());
          rp->create_status = CF_ERROR;
          return bRC_Error;
       }
@@ -2243,7 +2224,7 @@ bRC METAPLUGIN::queryParameter(bpContext *ctx, struct query_pkt *qp)
    /* read backend response */
    if (backend.ctx->read_command(ctx, cmd) < 0){
       DMSG(ctx, DERROR, "Cannot read backend query response for %s command.\n", qp->parameter);
-      JMSG(ctx, backend.ctx->is_fatal() ? M_FATAL : M_ERROR, "Cannot read backend query response for %s command.\n", qp->parameter);
+      JMSG(ctx, backend.ctx->jmsg_err_level(), "Cannot read backend query response for %s command.\n", qp->parameter);
       return bRC_Error;
    }
 

diff --git a/bacula/src/plugins/fd/pluginlib/ptcomm.h b/bacula/src/plugins/fd/pluginlib/ptcomm.h
index 561418a73c99745dfa39e5a81716fefba87e6576..e4eb8672c147b3c06f3443cb6e6385664a73eb71 100644 (file)
--- a/bacula/src/plugins/fd/pluginlib/ptcomm.h
+++ b/bacula/src/plugins/fd/pluginlib/ptcomm.h
@@ -250,6 +250,7 @@ public:
     */
    inline bool is_fatal() { return f_fatal || (f_error && abort_on_error); }
 
+   inline int jmsg_err_level() { return is_fatal() ? M_FATAL : M_ERROR; }
    /**
     * @brief Checks if backend signaled EOD, eod from backend is flagged on f_eod.
     *