accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [2/4] accumulo git commit: ACCUMULO-3979 make sure timers get stopped in the presence of exceptions
Date Fri, 28 Aug 2015 19:28:01 GMT
ACCUMULO-3979 make sure timers get stopped in the presence of exceptions


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32da99a8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32da99a8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32da99a8

Branch: refs/heads/master
Commit: 32da99a8379e05907838fc2009e073465f25f764
Parents: d77863e
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Fri Aug 28 15:24:18 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Fri Aug 28 15:24:18 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/client/BulkImporter.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/32da99a8/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index 86dde1e..37bb041 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -203,14 +203,14 @@ public class BulkImporter {
           while (keListIter.hasNext()) {
             KeyExtent ke = keListIter.next();
 
+            timer.start(Timers.QUERY_METADATA);
             try {
-              timer.start(Timers.QUERY_METADATA);
               tabletsToAssignMapFileTo.addAll(findOverlappingTablets(context, fs, locator,
entry.getKey(), ke));
-              timer.stop(Timers.QUERY_METADATA);
               keListIter.remove();
             } catch (Exception ex) {
               log.warn("Exception finding overlapping tablets, will retry tablet " + ke,
ex);
             }
+            timer.stop(Timers.QUERY_METADATA);
           }
 
           if (tabletsToAssignMapFileTo.size() > 0)


Mime
View raw message