Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4987 wrong use of incarnation var in SplitLogManager 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1212256 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-12-09 06:16:03 +00:00
parent 307ca7c68b
commit 2704cd8a57
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
View File

@ -339,22 +339,24 @@ public class SplitLogManager extends ZooKeeperListener {
LOG.debug("unacquired orphan task is done " + path);
}
} else {
// if in stopTrackingTasks() we were to make tasks orphan instead of
// forgetting about them then we will have to handle the race when
// accessing task.batch here.
if (!task.isOrphan()) {
synchronized (task.batch) {
if (status == SUCCESS) {
task.batch.done++;
} else {
task.batch.error++;
}
if ((task.batch.done + task.batch.error) == task.batch.installed) {
task.batch.notify();
synchronized (task) {
task.deleted = true;
// if in stopTrackingTasks() we were to make tasks orphan instead of
// forgetting about them then we will have to handle the race when
// accessing task.batch here.
if (!task.isOrphan()) {
synchronized (task.batch) {
if (status == SUCCESS) {
task.batch.done++;
} else {
task.batch.error++;
}
if ((task.batch.done + task.batch.error) == task.batch.installed) {
task.batch.notify();
}
}
}
}
task.deleted = true;
}
// delete the task node in zk. Keep trying indefinitely - its an async
// call and no one is blocked waiting for this node to be deleted. All
@ -601,12 +603,27 @@ public class SplitLogManager extends ZooKeeperListener {
*/
private Task createTaskIfAbsent(String path, TaskBatch batch) {
Task oldtask;
// batch.installed is only changed via this function and
// a single thread touches batch.installed.
oldtask = tasks.putIfAbsent(path, new Task(batch));
if (oldtask != null && oldtask.isOrphan()) {
LOG.info("Previously orphan task " + path +
" is now being waited upon");
oldtask.setBatch(batch);
return (null);
if (oldtask != null) {
synchronized (oldtask) {
// new task was not used.
batch.installed--;
if (oldtask.isOrphan()) {
if (oldtask.deleted) {
// The task is already done. Do not install the batch for this
// task because it might be too late for setDone() to update
// batch.done. There is no need for the batch creator to wait for
// this task to complete.
return (null);
}
LOG.info("Previously orphan task " + path +
" is now being waited upon");
oldtask.setBatch(batch);
return (null);
}
}
}
return oldtask;
}
@ -749,9 +766,7 @@ public class SplitLogManager extends ZooKeeperListener {
}
this.batch = batch;
if (batch != null) {
if (this.incarnation == 0) {
batch.installed++;
}
batch.installed++;
}
}