Changeset 37346

Timestamp:

Sep 2, 2014, 4:50:21 PM (12 years ago)

Author:

watersc1

Message:

Changes to allow retry to work at warp and stack stages, and new revertcomponent mode that turns 'fail's into 'retry's

Location:

tags/ipp-pv3-20140717/ippTools

Files:

• share/remotetool_definebyquery_stack.sql (modified) (1 diff)
• share/remotetool_definebyquery_warp.sql (modified) (1 diff)
• src/remotetool.c (modified) (3 diffs)
• src/remotetool.h (modified) (1 diff)
• src/remotetoolConfig.c (modified) (2 diffs)

tags/ipp-pv3-20140717/ippTools/share/remotetool_definebyquery_stack.sql

@@ -15 +15 @@
    JOIN remoteComponent USING (remote_id)
 WHERE
-remoteRun.stage = 'stack'
+remoteRun.stage = 'stack' and remoteComponent.state != 'retry'
 -- where hook %s
 ) AS R

tags/ipp-pv3-20140717/ippTools/share/remotetool_definebyquery_warp.sql

@@ -17 +17 @@
    JOIN remoteComponent USING (remote_id)
 WHERE
-remoteRun.stage = 'warp'
+remoteRun.stage = 'warp' and remoteComponent.state != 'retry'
 -- where hook %s
 ) AS R

tags/ipp-pv3-20140717/ippTools/src/remotetool.c

@@ -32 +32 @@
 static bool revertrunMode(pxConfig *config);
 static bool revertauthMode(pxConfig *config);
+static bool revertcomponentMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -61 +62 @@
     MODECASE(REMOTETOOL_MODE_REVERTRUN,       revertrunMode);
     MODECASE(REMOTETOOL_MODE_REVERTAUTH,      revertauthMode);
+    MODECASE(REMOTETOOL_MODE_REVERTCOMPONENT, revertcomponentMode);
 
   default:
@@ -577 +579 @@
 }
 
+static bool revertcomponentMode(pxConfig *config)
+{
+  PS_ASSERT_PTR_NON_NULL(config,false);
+  psMetadata *where = psMetadataAlloc();
+  psMetadata *values = psMetadataAlloc();
+
+  // required
+  PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
+  PXOPT_COPY_S64(config->args, where, "-stage_id", "stage_id", "==");
+  psMetadataAddStr(where,PS_LIST_TAIL,"state",0, "==", "fail");
+  
+  // value to set
+  psMetadataAddStr(values, PS_LIST_TAIL, "state",0, "==", "retry");
+  
+
+  long rows = psDBUpdateRows(config->dbh, "remoteComponent", where, values);
+  psFree(values);
+  psFree(where);
+  if (rows < 1) {
+    psError(PS_ERR_UNKNOWN,false, "no rows affected");
+    return(false);
+  }
+
+  return(true);
+
+  
+  
+
 static bool revertauthMode(pxConfig *config)
 {

tags/ipp-pv3-20140717/ippTools/src/remotetool.h

@@ -20 +20 @@
   REMOTETOOL_MODE_REVERTRUN,
   REMOTETOOL_MODE_REVERTAUTH,
+  REMOTETOOL_MODE_REVERTCOMPONENT,
 } remotetoolMode;
 

tags/ipp-pv3-20140717/ippTools/src/remotetoolConfig.c

@@ -70 +70 @@
   ADD_OPT(S16, doneprepArgs,  "-limit",             "limit to number of runs to display", 0);
 
+  // -revertcomponent
+  psMetadata   *revertcomponentArgs = psMetadataAlloc();
+  ADD_OPT(S64,  revertcomponentArgs, "-remote_id",       "run to revert components from", 0);
+  ADD_OPT(S64,  revertcomponentArgs, "-stage_id",        "component stage_id to revert", 0);
+  
+  
   // -listcomponents
   psMetadata   *listcomponentArgs = psMetadataAlloc();
@@ -126 +132 @@
   PXOPT_ADD_MODE("-doneprep",          "", REMOTETOOL_MODE_DONEPREP,        doneprepArgs);
   PXOPT_ADD_MODE("-listcomponent",     "", REMOTETOOL_MODE_LISTCOMPONENT,   listcomponentArgs);
+  PXOPT_ADD_MODE("-revertcomponent",   "", REMOTETOOL_MODE_REVERTCOMPONENT, revertcomponentArgs);
   PXOPT_ADD_MODE("-dropcomponent",     "", REMOTETOOL_MODE_DROPCOMPONENT,   dropcomponentArgs);
   PXOPT_ADD_MODE("-updaterun",         "", REMOTETOOL_MODE_UPDATERUN,       updaterunArgs);