Changeset 32670

Timestamp:

Nov 14, 2011, 5:14:16 PM (15 years ago)

Author:

bills

Message:

upon failure to revert if state is update set state to failed_revert_ud so that we
can know what to set the states to in -clearstatefaults

Location:

tags/ipp-20111110

Files:

• ippScripts/scripts/magic_destreak_revert.pl (modified) (1 diff)
• ippTools/src/magicdstool.c (modified) (5 diffs)
• ippTools/src/magicdstoolConfig.c (modified) (1 diff)

tags/ipp-20111110/ippScripts/scripts/magic_destreak_revert.pl

@@ -511 +511 @@
     my $command = "$magicdstool -updaterun";
     $command   .= " -magic_ds_id $magic_ds_id";
-    $command   .= " -set_state failed_revert";
+    if ($run_state ne 'update') {
+        $command .= " -set_state failed_revert";
+    } else {
+        $command .= " -set_state failed_revert_ud";
+    }
     $command   .= " -dbname $dbname" if defined $dbname;
 

tags/ipp-20111110/ippTools/src/magicdstool.c

@@ -53 +53 @@
 
 static bool setmagicDSRunState(pxConfig *config, psS64 magic_id, psString extraSetString, psMetadata *where, const char *state);
+static bool validDSRunState(const char *state);
 
 # define MODECASE(caseName, func) \
@@ -1212 +1213 @@
 
     psMetadata *where = psMetadataAlloc();
-    // new state (required
-    PXOPT_LOOKUP_STR(new_state, config->args, "-set_state", true, false);
+    // new state
+    PXOPT_LOOKUP_STR(new_state, config->args, "-set_state", false, false);
     // old state (required)
     PXOPT_LOOKUP_STR(state, config->args, "-state", true, false);
@@ -1237 +1238 @@
         if (!strcmp(state, "failed_revert")) {
             new_state = "new";
+        } else if (!strcmp(state, "failed_revert_ud")) {
+            new_state = "update";
         } else if (!strcmp(state, "failed_cleanup")) {
             new_state = "goto_cleaned";
@@ -1243 +1246 @@
             return false;
         }
+    } else {
+        if (!validDSRunState(new_state)) {
+            psError(PS_ERR_UNKNOWN, true, "unexpected value for new state: %s", new_state);
+            return false;
+        }
     }
     if (!p_psDBRunQueryF(config->dbh, query, new_state)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to revert");
+        psError(PS_ERR_UNKNOWN, false, "failed to clear state faults");
         psFree(query);
         return false;
@@ -1403 +1411 @@
           (strcmp(state, "wait") == 0) ||
           (strcmp(state, "failed_revert") == 0) ||
+          (strcmp(state, "failed_revert_ud") == 0) ||
           (strcmp(state, "error_cleaned") == 0) ||
           (strcmp(state, "restored") == 0) ||

tags/ipp-20111110/ippTools/src/magicdstoolConfig.c

@@ -163 +163 @@
     // -clearstatefaults
     psMetadata *clearstatefaultsArgs = psMetadataAlloc();
-    psMetadataAddStr(clearstatefaultsArgs, PS_LIST_TAIL, "-set_state", 0, "new value for state (required)", NULL);
+    psMetadataAddStr(clearstatefaultsArgs, PS_LIST_TAIL, "-set_state", 0, "new value for state", NULL);
     psMetadataAddStr(clearstatefaultsArgs, PS_LIST_TAIL, "-state", 0, "search by state (required)", NULL);
     psMetadataAddS64(clearstatefaultsArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magictool de-streak ID", 0);