diff options
6 files changed, 1 insertions, 82 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java index d2365bcbf00..990bce539ba 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java @@ -18,8 +18,7 @@ public interface FileDistribution { void sendDeployedFiles(String hostName, Set<FileReference> fileReferences); void reloadDeployFileDistributor(); - // TODO: Remove when 6.150 is the oldest version used - void limitSendingOfDeployedFilesTo(Collection<String> hostNames); + void removeDeploymentsThatHaveDifferentApplicationId(Collection<String> targetHostnames); static String getDefaultFileDBRoot() { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBHandler.java index d7dce9d3f3d..f0ce6104496 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBHandler.java @@ -31,11 +31,6 @@ public class FileDBHandler implements FileDistribution { } @Override - public void limitSendingOfDeployedFilesTo(Collection<String> hostNames) { - manager.limitSendingOfDeployedFilesTo(hostNames); - } - - @Override public void removeDeploymentsThatHaveDifferentApplicationId(Collection<String> targetHostnames) { manager.removeDeploymentsThatHaveDifferentApplicationId(targetHostnames); } 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 81c777df393..eb23d38e23e 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 @@ -14,7 +14,6 @@ import java.util.Set; public class MockFileDBHandler implements FileDistribution { public int sendDeployedFilesCalled = 0; public int reloadDeployFileDistributorCalled = 0; - public int limitSendingOfDeployedFilesToCalled = 0; public int removeDeploymentsThatHaveDifferentApplicationIdCalled = 0; @Override @@ -28,11 +27,6 @@ public class MockFileDBHandler implements FileDistribution { } @Override - public void limitSendingOfDeployedFilesTo(Collection<String> hostNames) { - limitSendingOfDeployedFilesToCalled++; - } - - @Override public void removeDeploymentsThatHaveDifferentApplicationId(Collection<String> targetHostnames) { removeDeploymentsThatHaveDifferentApplicationIdCalled++; } 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 5dc529e3381..2069ae48d76 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,7 +126,6 @@ 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().limitSendingOfDeployedFilesToCalled, is(0)); assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().reloadDeployFileDistributorCalled, is(0)); } diff --git a/filedistribution/src/vespa/filedistribution/manager/filedistributionmanager.cpp b/filedistribution/src/vespa/filedistribution/manager/filedistributionmanager.cpp index 954cce23205..f0825343f27 100644 --- a/filedistribution/src/vespa/filedistribution/manager/filedistributionmanager.cpp +++ b/filedistribution/src/vespa/filedistribution/manager/filedistributionmanager.cpp @@ -174,20 +174,6 @@ Java_com_yahoo_vespa_filedistribution_FileDistributionManager_setDeployedFilesIm JNIEXPORT void JNICALL -Java_com_yahoo_vespa_filedistribution_FileDistributionManager_limitSendingOfDeployedFilesToImpl( - JNIEnv *env, jobject self, jobjectArray hostNamesArg, jbyteArray appIdArg) -{ - try { - JNIArray<JNIString> hostNames(hostNamesArg, env); - JNIString appId(appIdArg, env); - - nativeFileDistributionManagerField.get(self, env)->_fileDBModel-> - cleanDeployedFilesToDownload(hostNames._value, appId._value); - } STANDARDCATCH() -} - -JNIEXPORT -void JNICALL Java_com_yahoo_vespa_filedistribution_FileDistributionManager_removeDeploymentsThatHaveDifferentApplicationIdImpl( JNIEnv *env, jobject self, jobjectArray hostNamesArg, jbyteArray appIdArg) { @@ -200,40 +186,3 @@ Java_com_yahoo_vespa_filedistribution_FileDistributionManager_removeDeploymentsT } STANDARDCATCH() } - - -JNIEXPORT -void JNICALL -Java_com_yahoo_vespa_filedistribution_FileDistributionManager_limitFilesTo( - JNIEnv *env, jobject self, jobjectArray fileReferencesArg) -{ - try { - JNIArray<JNIString> fileReferences(fileReferencesArg, env); - - nativeFileDistributionManagerField.get(self, env)->_fileDBModel-> - cleanFiles(fileReferences._value); - } STANDARDCATCH() -} - - -JNIEXPORT -jbyteArray JNICALL -Java_com_yahoo_vespa_filedistribution_FileDistributionManager_getProgressImpl( - JNIEnv *env, jobject self, jbyteArray fileReferenceArg, jobjectArray hostNamesArg) -{ - try { - JNIString fileReference(fileReferenceArg, env); - JNIArray<JNIString> hostNames(hostNamesArg, env); - - const FileDBModel::Progress progress = - nativeFileDistributionManagerField.get(self, env)->_fileDBModel-> - getProgress(fileReference._value, hostNames._value); - - jbyteArray result = env->NewByteArray(progress.size()); - if (!result) - return 0; //exception thrown when returning - - env->SetByteArrayRegion(result, 0, progress.size(), &*progress.begin()); - return result; - } STANDARDCATCH(return 0) -} diff --git a/filedistributionmanager/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionManager.java b/filedistributionmanager/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionManager.java index 0a803269ff6..f0c463abe70 100644 --- a/filedistributionmanager/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionManager.java +++ b/filedistributionmanager/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionManager.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.filedistribution; import java.io.File; import java.io.IOException; import java.util.Collection; -import java.util.List; import java.util.concurrent.locks.Lock; /** @@ -30,13 +29,8 @@ public class FileDistributionManager { private native void setDeployedFilesImpl(byte[] host, byte[] appId, byte[][] fileReferences); - private native void limitSendingOfDeployedFilesToImpl(byte[][] hostNames, byte[] appId); - private native void limitFilesToImpl(byte[][] fileReferences); private native void removeDeploymentsThatHaveDifferentApplicationIdImpl(byte[][] asByteArrays, byte[] bytes); - private native byte[] getProgressImpl(byte[] fileReference, - byte[][] hostNames); - private byte[][] getAsByteArrays(Collection<String> strings) { byte[][] byteArrays = new byte[strings.size()][]; int i = 0; @@ -121,17 +115,6 @@ public class FileDistributionManager { } } - public void limitSendingOfDeployedFilesTo(Collection<String> hostNames) { - try (LockGuard guard = new LockGuard(lock)) { - limitSendingOfDeployedFilesToImpl(getAsByteArrays(hostNames), appId.getBytes()); - } - } - - public byte[] getProgress(String fileReference, - List<String> hostNamesSortedAscending) { - return getProgressImpl(fileReference.getBytes(), getAsByteArrays(hostNamesSortedAscending)); - } - public native void shutdown(); |