[storm] branch master updated: Revert "STORM-3476 don't query remote files on cleanup if target size is acceptable"

[sr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

srdo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git


The following commit(s) were added to refs/heads/master by this push:
     new 3b993a9  Revert "STORM-3476 don't query remote files on cleanup if target size is acceptable"
     new b27da9f  Merge pull request #3119 from srdo/revert-STORM-3476
3b993a9 is described below

commit 3b993a98ea42bec22d8ad7eb9699f30c6afba9b7
Author: Stig Rohde Døssing <sr...@apache.org>
AuthorDate: Tue Aug 27 22:29:35 2019 +0200

    Revert "STORM-3476 don't query remote files on cleanup if target size is acceptable"
    
    This reverts commit 1008feba371dd33232070603a54f8b3f4ed49ae7.
---
 .../org/apache/storm/localizer/LocalizedResourceRetentionSet.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
index ddb59c8..3c31d4e 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
@@ -81,10 +81,6 @@ public class LocalizedResourceRetentionSet {
     public void cleanup(ClientBlobStore store) {
         LOG.debug("cleanup target size: {} current size is: {}", targetSize, currentSize);
         long bytesOver = currentSize - targetSize;
-        if (bytesOver <= 0) { // no need to query remote files
-            return;
-        }
-
         //First delete everything that no longer exists...
         for (Iterator<Map.Entry<LocallyCachedBlob, Map<String, ? extends LocallyCachedBlob>>> i = noReferences.entrySet().iterator();
              i.hasNext(); ) {