Author: stack
Date: Mon Nov 29 23:45:54 2010
New Revision: 1040343
URL: http://svn.apache.org/viewvc?rev=1040343&view=rev
Log:
HBASE-3263 Stack overflow in AssignmentManager
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Modified: hbase/branches/0.90/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1040343&r1=1040342&r2=1040343&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Mon Nov 29 23:45:54 2010
@@ -708,6 +708,7 @@ Release 0.90.0 - Unreleased
HBASE-3283 NPE in AssignmentManager if processing shutdown of RS who
doesn't have any regions assigned to it
HBASE-3265 Regionservers waiting for ROOT while Master waiting for
RegionServers
+ HBASE-3263 Stack overflow in AssignmentManager
IMPROVEMENTS
Modified:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1040343&r1=1040342&r2=1040343&view=diff
==============================================================================
---
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Mon Nov 29 23:45:54 2010
@@ -93,6 +93,11 @@ public class AssignmentManager extends Z
private TimeoutMonitor timeoutMonitor;
+ /*
+ * Maximum times we recurse an assignment. See below in {...@link
#assign()}.
+ */
+ private final int maximumAssignmentRecursions;
+
/**
* Regions currently in transition. Map of encoded region names to the
master
* in-memory state for that region.
@@ -158,6 +163,8 @@ public class AssignmentManager extends Z
Threads.setDaemonThreadRunning(timeoutMonitor,
master.getServerName() + ".timeoutMonitor");
this.zkTable = new ZKTable(this.master.getZooKeeper());
+ this.maximumAssignmentRecursions =
+
this.master.getConfiguration().getInt("hbase.assignment.maximum.recursions",
10);
}
/**
@@ -811,9 +818,23 @@ public class AssignmentManager extends Z
/**
* Caller must hold lock on the passed <code>state</code> object.
* @param state
+ * @param setOfflineInZK
+ * @param forceNewPlan
*/
private void assign(final RegionState state, final boolean setOfflineInZK,
final boolean forceNewPlan) {
+ assign(state, setOfflineInZK, forceNewPlan, new AtomicInteger(0));
+ }
+
+ /**
+ * Caller must hold lock on the passed <code>state</code> object.
+ * @param state
+ * @param setOfflineInZK
+ * @param forceNewPlan
+ * @param recursions Keep a count so can have upper bound on recursions.
+ */
+ private void assign(final RegionState state, final boolean setOfflineInZK,
+ final boolean forceNewPlan, final int recursions) {
if (setOfflineInZK && !setOfflineInZooKeeper(state)) return;
if (this.master.isStopped()) {
LOG.debug("Server stopped; skipping assign of " + state);
@@ -831,18 +852,22 @@ public class AssignmentManager extends Z
} catch (Throwable t) {
LOG.warn("Failed assignment of " +
state.getRegion().getRegionNameAsString() + " to " +
- plan.getDestination() + ", trying to assign elsewhere instead", t);
+ plan.getDestination() + ", trying to assign elsewhere instead; retry="
+
+ recursions, t);
// Clean out plan we failed execute and one that doesn't look like it'll
// succeed anyways; we need a new plan!
// Transition back to OFFLINE
state.update(RegionState.State.OFFLINE);
- // Force a new plan and reassign.
+ // Force a new plan and reassign. Will return null if no servers.
if (getRegionPlan(state, plan.getDestination(), true) == null) {
LOG.warn("Unable to find a viable location to assign region " +
- state.getRegion().getRegionNameAsString());
+ state.getRegion().getRegionNameAsString());
return;
}
- assign(state, false, false);
+ if (recursions < this.maximumAssignmentRecursions) {
+ assign(state, false, false, recursions + 1);
+ }
+ // Else Just leave the region in RIT. On timeout, we'll retry later.
}
}
@@ -926,7 +951,7 @@ public class AssignmentManager extends Z
// The remove below hinges on the fact that the call to
// serverManager.getOnlineServersList() returns a copy
if (serverToExclude != null) servers.remove(serverToExclude);
- if (servers.size() <= 0) return null;
+ if (servers.isEmpty()) return null;
RegionPlan randomPlan = new RegionPlan(state.getRegion(), null,
LoadBalancer.randomAssignment(servers));
synchronized (this.regionPlans) {
