diff --git a/share/words.xml b/share/words.xml index 2e3ac31c..73e7b71c 100644 --- a/share/words.xml +++ b/share/words.xml @@ -509,6 +509,7 @@ The output, if any, was; Unable to find the DRBD config from either node in the Anvil! with the Anvil! UUID: [#!variable!anvil_uuid!#]. Has scan_drbd (as part of scancore) run on either nodes? ' to specify the alert level of the test message.]]> There are two or more entries on the host: [#!variable!host!#] in the history table: [#!variable!table!#]! The duplicate modidied_date and column UUID are: [#!variable!key!#] (time is UTC), and the query that exposed the dupplicate was: [#!variable!query!#]. This is likely caused by two database writes where the 'modified_date' wasn't updated between writes. + [ Error ] - There was a problem purging records. The details of the problem should be in the logs. diff --git a/tools/striker-purge-target b/tools/striker-purge-target index a8aa636b..db2d0a05 100755 --- a/tools/striker-purge-target +++ b/tools/striker-purge-target @@ -295,7 +295,13 @@ WHERE } # Commit. - $anvil->Database->write({query => $queries, source => $THIS_FILE, line => __LINE__}); + my $problem = $anvil->Database->write({query => $queries, source => $THIS_FILE, line => __LINE__}); + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }}); + if ($problem) + { + $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, priority => "err", key => "error_0364"}); + $anvil->nice_exit({exit_code => 1}); + } $vacuum = 1; $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { vacuum => $vacuum }}); @@ -363,7 +369,13 @@ if ($anvil->data->{purge}{anvil_uuid}) } # Commit. - $anvil->Database->write({query => $queries, source => $THIS_FILE, line => __LINE__}); + my $problem = $anvil->Database->write({query => $queries, source => $THIS_FILE, line => __LINE__}); + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }}); + if ($problem) + { + $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, priority => "err", key => "error_0364"}); + $anvil->nice_exit({exit_code => 1}); + } $vacuum = 1; $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { vacuum => $vacuum }});