aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2023-09-15 11:38:33 +0200
committerGitHub <noreply@github.com>2023-09-15 11:38:33 +0200
commitae60f7d9306002e4f06a292cb75a96f5f9018a70 (patch)
tree812012a10f3f0a44a3edb3a63a73ae15f6c09c2c
parent15a597984592cef5fab77c9a72a3b04a356a4943 (diff)
parent8c462aa582d1687d2694daa6b04a06b25b81a6b1 (diff)
Merge pull request #28535 from vespa-engine/hmusum/make-write-application-data-as-json-default
Change default value of write-application-data-as-json to true
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java6
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java2
2 files changed, 5 insertions, 3 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
index 81544f4ed61..14357762243 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
@@ -125,10 +125,12 @@ public class TenantApplicationsTest {
writeActiveTransaction(repo, myapp, 3);
String path = TenantRepository.getApplicationsPath(tenantName).append(myapp.serializedForm()).getAbsolute();
assertNotNull(curatorFramework.checkExists().forPath(path));
- assertEquals("3", Utf8.toString(curatorFramework.getData().forPath(path)));
+ assertEquals("{\"applicationId\":\"tenant:myapp:myinst\",\"activeSession\":3,\"lastDeployedSession\":3}",
+ Utf8.toString(curatorFramework.getData().forPath(path)));
writeActiveTransaction(repo, myapp, 5);
assertNotNull(curatorFramework.checkExists().forPath(path));
- assertEquals("5", Utf8.toString(curatorFramework.getData().forPath(path)));
+ assertEquals("{\"applicationId\":\"tenant:myapp:myinst\",\"activeSession\":5,\"lastDeployedSession\":5}",
+ Utf8.toString(curatorFramework.getData().forPath(path)));
}
@Test
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index be0bf2439be..de14d4e7b00 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -372,7 +372,7 @@ public class Flags {
HOSTNAME, CLOUD_ACCOUNT);
public static final UnboundBooleanFlag WRITE_APPLICATION_DATA_AS_JSON = defineFeatureFlag(
- "write-application-data-as-json", false,
+ "write-application-data-as-json", true,
List.of("hmusum"), "2023-08-27", "2023-10-01",
"Whether to write application data (active session id, last deployed session id etc. ) as json",
"Takes effect immediately");