[accumulo] 01/01: Merge branch '1.9'
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 13a025d740a3f7bc3ca078f3557bff45f7751c60
Merge: 1311520 9a5b7bd
Author: Keith Turner
AuthorDate: Mon Jul 2 10:20:11 2018 -0400
Merge branch '1.9'
.../org/apache/accumulo/tserver/tablet/Tablet.java | 42 +-
1 file changed, 17 insertions(+), 25 deletions(-)
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 28c32a5,4590872..2ef4087
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@@ -2484,11 -2500,13 +2473,13 @@@ public class Tablet implements TabletCo
}
for (String logger : currentLogsCopy) {
- log.debug("Logs for current memory: " + getExtent() + " " + logger);
+ log.debug("Logs for current memory: {} {}", getExtent(), logger);
}
- for (String logger : doomed) {
- log.debug("Logs to be destroyed: {} {}", getExtent(), logger);
+ Set doomed = new HashSet<>();
+ for (DfsLogger logger : doomedLogs) {
- log.debug("Logs to be destroyed: " + getExtent() + " " +
logger.getMeta());
++ log.debug("Logs to be destroyed: {} {}", getExtent(), logger.getMeta());
+ doomed.add(logger.getMeta());
}
return doomed;
[accumulo] branch master updated (1311520 -> 13a025d)
This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 1311520 Merge branch '1.9' add 9a5b7bd fixes #543 Avoid logLock when determining WALs in use (#545) new 13a025d Merge branch '1.9' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/accumulo/tserver/tablet/Tablet.java | 42 +- 1 file changed, 17 insertions(+), 25 deletions(-)
[accumulo] branch 1.9 updated: fixes #543 Avoid logLock when determining WALs in use (#545)
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new 9a5b7bd fixes #543 Avoid logLock when determining WALs in use (#545)
9a5b7bd is described below
commit 9a5b7bdf2517206258c6a307d540a1bfbadf9aad
Author: Keith Turner
AuthorDate: Mon Jul 2 10:14:00 2018 -0400
fixes #543 Avoid logLock when determining WALs in use (#545)
---
.../org/apache/accumulo/tserver/tablet/Tablet.java | 44 +-
1 file changed, 18 insertions(+), 26 deletions(-)
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 508e87e..4590872 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -2459,25 +2459,17 @@ public class Tablet implements TabletCommitter {
private Set currentLogs = new HashSet<>();
public void removeInUseLogs(Set candidates) {
-// This lock is held while clearing otherLogs and adding a minc file to
metadata table. Not
-// holding this lock leads to a small chance of data loss if tserver dies
between clearing
-// otherLogs and adding file to metadata table AND this method was called
in the time between.
-logLock.lock();
-try {
- // acquire locks in same order as other places in code to avoid deadlock
- synchronized (this) {
-// remove logs related to minor compacting data
-candidates.removeAll(otherLogs);
-// remove logs related to tablets in memory data
-candidates.removeAll(currentLogs);
- }
-} finally {
- logLock.unlock();
+synchronized (this) {
+ // remove logs related to minor compacting data
+ candidates.removeAll(otherLogs);
+ // remove logs related to tablets in memory data
+ candidates.removeAll(currentLogs);
+ // remove logs related to minor compaction file being added to the
metadata table
+ candidates.removeAll(doomedLogs);
}
}
Set beginClearingUnusedLogs() {
-Set doomed = new HashSet<>();
ArrayList otherLogsCopy = new ArrayList<>();
ArrayList currentLogsCopy = new ArrayList<>();
@@ -2486,48 +2478,48 @@ public class Tablet implements TabletCommitter {
logLock.lock();
synchronized (this) {
- if (removingLogs)
+ if (doomedLogs.size() > 0)
throw new IllegalStateException("Attempted to clear logs when removal
of logs in progress");
for (DfsLogger logger : otherLogs) {
otherLogsCopy.add(logger.toString());
-doomed.add(logger.getMeta());
+doomedLogs.add(logger);
}
for (DfsLogger logger : currentLogs) {
currentLogsCopy.add(logger.toString());
-doomed.remove(logger.getMeta());
+doomedLogs.remove(logger);
}
otherLogs = Collections.emptySet();
-
- if (doomed.size() > 0)
-removingLogs = true;
}
// do debug logging outside tablet lock
for (String logger : otherLogsCopy) {
- log.debug("Logs for memory compacted: " + getExtent() + " " +
logger.toString());
+ log.debug("Logs for memory compacted: " + getExtent() + " " + logger);
}
for (String logger : currentLogsCopy) {
log.debug("Logs for current memory: " + getExtent() + " " + logger);
}
-for (String logger : doomed) {
- log.debug("Logs to be destroyed: " + getExtent() + " " + logger);
+Set doomed = new HashSet<>();
+for (DfsLogger logger : doomedLogs) {
+ log.debug("Logs to be destroyed: " + getExtent() + " " +
logger.getMeta());
+ doomed.add(logger.getMeta());
}
return doomed;
}
synchronized void finishClearingUnusedLogs() {
-removingLogs = false;
+doomedLogs.clear();
logLock.unlock();
}
private Set otherLogs = Collections.emptySet();
- private boolean removingLogs = false;
+ // logs related to minor compaction file being added to the metadata table
+ private Set doomedLogs = new HashSet<>();
// this lock is basically used to synchronize writing of log info to metadata
private final ReentrantLock logLock = new ReentrantLock();
