diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-02-09 17:06:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 17:06:28 +0100 |
commit | ead0a8b621cc85b67f454f2fbc089dcb5cf48fee (patch) | |
tree | 1105d7f92b74b2dfb036ba386b7297aae7ca8e0a | |
parent | d2bae27cf1086bcf45a4c94de7ffeb95bd84a173 (diff) | |
parent | f5004875b8c1d27d539a0887ed11078f1d195643 (diff) |
Merge pull request #4998 from vespa-engine/hmusum/remove-call-to-reload-filedistributor
Remove call to reload file distributor
9 files changed, 7 insertions, 32 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java index 3fec8550623..b8b329f2b04 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java @@ -53,6 +53,8 @@ public interface Model { * once per deployment. * @param fileDistribution {@link com.yahoo.config.model.api.FileDistribution} instance. */ + // TODO: Remove when 6.206 is the oldest version in use + @Deprecated default void reloadDeployFileDistributor(FileDistribution fileDistribution) { } /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 47a644a39d4..a4130c8052c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -412,11 +412,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri } @Override - public void reloadDeployFileDistributor(FileDistribution fileDistribution) { - getFileDistributor().reloadDeployFileDistributor(fileDistribution); - } - - @Override public AllocatedHosts allocatedHosts() { return allocatedHosts; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java index ffba56fa17f..34e242400d3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java @@ -24,9 +24,7 @@ public class FileDistributionConfigProvider { } public void getConfig(FiledistributorrpcConfig.Builder builder) { - // If disabled config proxy should act as file distributor, so use config proxy port - int port = ConfigProxy.BASEPORT; - builder.connectionspec("tcp/" + host.getHostname() + ":" + port); + builder.connectionspec("tcp/" + host.getHostname() + ":" + ConfigProxy.BASEPORT); } public void getConfig(FilereferencesConfig.Builder builder) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java index ad27d86fb84..abd4b604a6d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java @@ -133,10 +133,4 @@ public class FileDistributor { dbHandler.removeDeploymentsThatHaveDifferentApplicationId(getTargetHostnames()); } - // should only be called during deploy, and only once, since it leads to file distributor - // rescanning all files, which is very expensive ATM (April 2016) - public void reloadDeployFileDistributor(FileDistribution dbHandler) { - dbHandler.reloadDeployFileDistributor(); - } - } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java index d3879f1ab36..96137652e22 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java @@ -265,7 +265,7 @@ public class VespaModelTestCase { assertThat(admin.getConfigservers().size(), is(1)); Set<HostInfo> hosts = model.getHosts(); assertThat(hosts.size(), is(1)); - //logd, config proxy, sentinel, config server, slobrok, log server, file distributor + //logd, config proxy, sentinel, config server, slobrok, log server HostInfo host = hosts.iterator().next(); assertThat(host.getServices().size(), is(6)); new LogdConfig((LogdConfig.Builder) model.getConfig(new LogdConfig.Builder(), "admin/model")); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java index dcc590180f2..d518867407a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java @@ -12,7 +12,6 @@ import java.util.Set; */ public class MockFileDBHandler implements FileDistribution { public int sendDeployedFilesCalled = 0; - public int reloadDeployFileDistributorCalled = 0; public int removeDeploymentsThatHaveDifferentApplicationIdCalled = 0; @Override @@ -26,9 +25,7 @@ public class MockFileDBHandler implements FileDistribution { } @Override - public void reloadDeployFileDistributor() { - reloadDeployFileDistributorCalled++; - } + public void reloadDeployFileDistributor() {} @Override public void removeDeploymentsThatHaveDifferentApplicationId(Collection<String> targetHostnames) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index fd645c86d1b..5c19aae9a7e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -102,7 +102,6 @@ public class SessionPreparer { preparation.writeStateZK(); preparation.writeRotZK(); preparation.distribute(); - preparation.reloadDeployFileDistributor(); } log.log(LogLevel.DEBUG, () -> "time used " + params.getTimeoutBudget().timesUsed() + " : " + params.getApplicationId()); @@ -221,13 +220,6 @@ public class SessionPreparer { checkTimeout("distribute files"); } - void reloadDeployFileDistributor() { - if (prepareResult.asList().isEmpty()) return; - PreparedModelsBuilder.PreparedModelResult aModelResult = prepareResult.asList().get(0); - aModelResult.model.reloadDeployFileDistributor(aModelResult.fileDistributionProvider.getFileDistribution()); - checkTimeout("reload all deployed files in file distributor"); - } - ConfigChangeActions result() { return prepareResult.getConfigChangeActions(); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java index 2069ae48d76..ac16f1f71a7 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java @@ -126,15 +126,12 @@ public class SessionPreparerTest extends TestWithCurator { new PrepareParams.Builder().dryRun(true).timeoutBudget(TimeoutBudgetTest.day()).build(), Optional.empty(), tenantPath, Instant.now()); assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().sendDeployedFilesCalled, is(0)); - assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().reloadDeployFileDistributorCalled, is(0)); } @Test public void require_that_application_is_prepared() throws Exception { preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now()); assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().sendDeployedFilesCalled, is(2)); - // Should be called only once no matter how many model versions are built - assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().reloadDeployFileDistributorCalled, is(1)); assertTrue(configCurator.exists(sessionsPath.append(ConfigCurator.USERAPP_ZK_SUBPATH).append("services.xml").getAbsolute())); } diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java index 0d98176d631..7627e9f04fb 100644 --- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java +++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java @@ -72,7 +72,7 @@ class FileAcquirerImpl implements FileAcquirer { private void logWarning() { if (logCount == 0 || System.currentTimeMillis() > nextLogTime ) { - log.warning("Could not connect to the file distributor '" + spec.toString() + "'" + " - " + this + "@" + System.identityHashCode(this)); + log.warning("Could not connect to the config proxy '" + spec.toString() + "'" + " - " + this + "@" + System.identityHashCode(this)); nextLogTime = System.currentTimeMillis() + Math.min(TimeUnit.DAYS.toMillis(1), @@ -152,7 +152,7 @@ class FileAcquirerImpl implements FileAcquirer { if (request.checkReturnTypes("s")) { return new File(request.returnValues().get(0).asString()); } else if (!request.isError()) { - throw new RuntimeException("Invalid answer from file distributor: " + request.returnValues()); + throw new RuntimeException("Invalid answer from config proxy: " + request.returnValues()); } else if (temporaryError(request.errorCode())) { log.log(LogLevel.INFO, "Retrying waitFor: " + request.errorCode() + " -- " + request.errorMessage()); Thread.sleep(1000); |