summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2022-03-11 09:43:38 +0100
committerMartin Polden <mpolden@mpolden.no>2022-03-11 10:08:40 +0100
commitf1b6af070d5badd5c610d4a052df5ca5952dfb82 (patch)
tree84ca5d2d7f1b630d4e11600f2a63ce4bc0356d90 /config
parent80abc0659f07445536d92c59fae58dfb1f0ecae8 (diff)
Reject config request when major version is incompatible
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/ErrorCode.java43
1 files changed, 23 insertions, 20 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/ErrorCode.java b/config/src/main/java/com/yahoo/vespa/config/ErrorCode.java
index 164fe36e2c6..6f0f121a9a6 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ErrorCode.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ErrorCode.java
@@ -38,31 +38,34 @@ public final class ErrorCode {
public static final int INCONSISTENT_CONFIG_MD5 = UNKNOWN_CONFIG + 400;
+ public static final int INCOMPATIBLE_VESPA_VERSION = UNKNOWN_CONFIG + 500;
+
private ErrorCode() {
}
public static String getName(int error) {
switch(error) {
- case UNKNOWN_CONFIG: return "UNKNOWN_CONFIG";
- case UNKNOWN_DEFINITION: return "UNKNOWN_DEFINITION";
- case UNKNOWN_DEF_MD5: return "UNKNOWN_DEF_MD5";
- case ILLEGAL_NAME: return "ILLEGAL_NAME";
- case ILLEGAL_VERSION: return "ILLEGAL_VERSION";
- case ILLEGAL_CONFIGID: return "ILLEGAL_CONFIGID";
- case ILLEGAL_DEF_MD5: return "ILLEGAL_DEF_MD5";
- case ILLEGAL_CONFIG_MD5: return "ILLEGAL_CONFIG_MD5";
- case ILLEGAL_TIMEOUT: return "ILLEGAL_TIMEOUT";
- case ILLEGAL_GENERATION: return "ILLEGAL_GENERATION";
- case ILLEGAL_SUB_FLAG: return "ILLEGAL_SUBSCRIBE_FLAG";
- case ILLEGAL_NAME_SPACE: return "ILLEGAL_NAME_SPACE";
- case ILLEGAL_CLIENT_HOSTNAME: return "ILLEGAL_CLIENT_HOSTNAME";
- case OUTDATED_CONFIG: return "OUTDATED_CONFIG";
- case INTERNAL_ERROR: return "INTERNAL_ERROR";
- case APPLICATION_NOT_LOADED: return "APPLICATION_NOT_LOADED";
- case ILLEGAL_PROTOCOL_VERSION: return "ILLEGAL_PROTOCOL_VERSION";
- case INCONSISTENT_CONFIG_MD5: return "INCONSISTENT_CONFIG_MD5";
- case UNKNOWN_VESPA_VERSION: return "UNKNOWN_VESPA_VERSION";
- default: return "Unknown error";
+ case UNKNOWN_CONFIG: return "UNKNOWN_CONFIG";
+ case UNKNOWN_DEFINITION: return "UNKNOWN_DEFINITION";
+ case UNKNOWN_DEF_MD5: return "UNKNOWN_DEF_MD5";
+ case ILLEGAL_NAME: return "ILLEGAL_NAME";
+ case ILLEGAL_VERSION: return "ILLEGAL_VERSION";
+ case ILLEGAL_CONFIGID: return "ILLEGAL_CONFIGID";
+ case ILLEGAL_DEF_MD5: return "ILLEGAL_DEF_MD5";
+ case ILLEGAL_CONFIG_MD5: return "ILLEGAL_CONFIG_MD5";
+ case ILLEGAL_TIMEOUT: return "ILLEGAL_TIMEOUT";
+ case ILLEGAL_GENERATION: return "ILLEGAL_GENERATION";
+ case ILLEGAL_SUB_FLAG: return "ILLEGAL_SUBSCRIBE_FLAG";
+ case ILLEGAL_NAME_SPACE: return "ILLEGAL_NAME_SPACE";
+ case ILLEGAL_CLIENT_HOSTNAME: return "ILLEGAL_CLIENT_HOSTNAME";
+ case OUTDATED_CONFIG: return "OUTDATED_CONFIG";
+ case INTERNAL_ERROR: return "INTERNAL_ERROR";
+ case APPLICATION_NOT_LOADED: return "APPLICATION_NOT_LOADED";
+ case ILLEGAL_PROTOCOL_VERSION: return "ILLEGAL_PROTOCOL_VERSION";
+ case INCONSISTENT_CONFIG_MD5: return "INCONSISTENT_CONFIG_MD5";
+ case UNKNOWN_VESPA_VERSION: return "UNKNOWN_VESPA_VERSION";
+ case INCOMPATIBLE_VESPA_VERSION: return "INCOMPATIBLE_VESPA_VERSION";
+ default: return "Unknown error";
}
}