diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-03-23 06:51:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-23 06:51:44 +0100 |
commit | a608e846d491e7bd274acee7670427783fcfd6e9 (patch) | |
tree | e6d3eb19ffe0073538dad3dd47a76ee34d19579d /configserver | |
parent | 2ca1ea15630ccb6f0548c1cafd4bb01bb98b190a (diff) | |
parent | c030ac418be17ba2115e9e5761570bc39533a8c6 (diff) |
Merge pull request #17109 from vespa-engine/hmusum/wait-until-application-has-been-removed-3
Stop waiting until appliction has been removed
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index f21e58a4491..adbe15ff94d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -532,7 +532,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye } else { transaction.commit(); } - waitForApplicationRemoved(tenantApplications, applicationId); return true; } finally { applicationTransaction.ifPresent(ApplicationTransaction::close); @@ -591,21 +590,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye return fileReferencesToDelete; } - private void waitForApplicationRemoved(TenantApplications applications, ApplicationId applicationId) { - log.log(Level.FINE, "Waiting for " + applicationId + " to be deleted"); - Duration duration = Duration.ofSeconds(30); - Instant end = Instant.now().plus(duration); - do { - if ( ! (applications.hasApplication(applicationId))) - return; - log.log(Level.FINE, "Application " + applicationId + " not deleted yet, will retry"); - try { - Thread.sleep(100); - } catch (InterruptedException interruptedException) {/* ignore */} - } while (Instant.now().isBefore(end)); - log.log(Level.INFO, "Application " + applicationId + " not deleted after " + duration + ", giving up"); - } - private Set<String> getFileReferencesInUse() { Set<String> fileReferencesInUse = new HashSet<>(); // Intentionally skip applications that we for some reason do not find |