diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-03-10 16:40:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-10 16:40:42 +0100 |
commit | 2b6323bdd0f2dbf825d65d6527bbcbcb92d526ae (patch) | |
tree | 13a5e8ed8e6b41eb377051353f4a436cfaf4679c | |
parent | ece3c839ccbba33f90a025b26a53fdb393492179 (diff) | |
parent | b74f22fb9456e21dadc7e6cd8b94f787a9a04687 (diff) |
Merge pull request #12526 from vespa-engine/revert-12433-hmusum/keep-ranksetup-validator-temp-files-if-force
Revert "Keep temp files if force is true (for debugging)"
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java index c2225c93a4e..7f8ff6edd85 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java @@ -33,7 +33,7 @@ import java.util.logging.Logger; /** * Validate rank setup for all search clusters (rank-profiles, index-schema, attributes configs), validating done - * by running through the binary 'vespa-verify-ranksetup'. Will not delete temporary files if <em>force</em> is true + * by running through the binary 'vespa-verify-ranksetup' * * @author vegardh */ @@ -71,7 +71,7 @@ public class RankSetupValidator extends Validator { } catch (IOException e) { throw new RuntimeException(e); } finally { - if (cfgDir != null && !force) + if (cfgDir != null) deleteTempDir(cfgDir); } } @@ -80,7 +80,7 @@ public class RankSetupValidator extends Validator { Instant start = Instant.now(); try { boolean ret = execValidate(configId, searchCluster, sdName, deployLogger); - if (!ret && !force) { + if (!ret) { // Give up, don't say same error msg repeatedly deleteTempDir(tempDir); } |