Merge pull request #24966 from vespa-engine/hmusum/write-quota-to-zk-also-when-creating-session-from-existing

Write quota to zk also when creating session from existing one

2 files changed, 8 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
index 62640668932..903323fcd58 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
@@ -6,6 +6,7 @@ import com.yahoo.config.FileReference;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationMetaData;
 import com.yahoo.config.application.api.ApplicationPackage;
+import com.yahoo.config.model.api.Quota;
 import com.yahoo.config.model.api.TenantSecretStore;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ApplicationId;
@@ -19,7 +20,6 @@ import com.yahoo.transaction.Transaction;
 import com.yahoo.vespa.config.server.NotFoundException;
 import com.yahoo.vespa.config.server.application.ApplicationSet;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
-
 import java.security.cert.X509Certificate;
 import java.time.Instant;
 import java.util.List;
@@ -141,6 +141,10 @@ public abstract class Session implements Comparable<Session>  {
         sessionZooKeeperClient.writeAthenzDomain(athenzDomain);
     }
 
+    public void setQuota(Optional<Quota> quota) {
+        sessionZooKeeperClient.writeQuota(quota);
+    }
+
     public void setTenantSecretStores(List<TenantSecretStore> tenantSecretStores) {
         sessionZooKeeperClient.writeTenantSecretStores(tenantSecretStores);
     }
@@ -180,6 +184,8 @@ public abstract class Session implements Comparable<Session>  {
 
     public Optional<AthenzDomain> getAthenzDomain() { return sessionZooKeeperClient.readAthenzDomain(); }
 
+    public Optional<Quota> getQuota() { return sessionZooKeeperClient.readQuota(); }
+
     public AllocatedHosts getAllocatedHosts() {
         return sessionZooKeeperClient.getAllocatedHosts();
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 6fea1276633..9c50636ecfb 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -285,6 +285,7 @@ public class SessionRepository {
         session.setVespaVersion(existingSession.getVespaVersion());
         session.setDockerImageRepository(existingSession.getDockerImageRepository());
         session.setAthenzDomain(existingSession.getAthenzDomain());
+        session.setQuota(existingSession.getQuota());
         session.setTenantSecretStores(existingSession.getTenantSecretStores());
         session.setOperatorCertificates(existingSession.getOperatorCertificates());
         session.setCloudAccount(existingSession.getCloudAccount());