From 778c991f6b0f9468197c3ee1a3fbea523470892a Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 11 Jun 2021 17:14:36 +0200 Subject: Send empty sentinel config as an empty config Not as an empty payload. The sentinel will stop services not in the service array so the result should remain the same. --- .../java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configserver') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java index 637fc421457..fc031682f96 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.config.server.rpc; import com.yahoo.cloud.config.SentinelConfig; import com.yahoo.collections.Pair; import com.yahoo.component.Version; +import com.yahoo.config.ConfigInstance; import com.yahoo.config.provision.TenantName; import com.yahoo.jrt.Request; import com.yahoo.net.HostName; @@ -164,7 +165,8 @@ class GetConfigProcessor implements Runnable { private void returnEmpty(JRTServerConfigRequest request) { log.log(Level.FINE, () -> "Returning empty sentinel config for request from " + request.getClientHostName()); - ConfigPayload emptyPayload = ConfigPayload.empty(); + //ConfigPayload emptyPayload = ConfigPayload.empty(); + var emptyPayload = ConfigPayload.fromInstance(new SentinelConfig.Builder().build()); String configMd5 = ConfigUtils.getMd5(emptyPayload); ConfigResponse config = SlimeConfigResponse.fromConfigPayload(emptyPayload, 0, false, configMd5); request.addOkResponse(request.payloadFromResponse(config), config.getGeneration(), false, config.getConfigMd5()); -- cgit v1.2.3