From dc1d743ce6dffe85be9af021021acc2a77389640 Mon Sep 17 00:00:00 2001
From: Jimmy Xiang <jxiang@cloudera.com>
Date: Tue, 12 Aug 2014 12:57:27 -0700
Subject: [PATCH] HBASE-11727 Assignment wait time error in case of
 ServerNotRunningYetException

---
 .../org/apache/hadoop/hbase/master/AssignmentManager.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 06bb33688b1..a568a29712f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -2104,8 +2104,9 @@ public class AssignmentManager extends ZooKeeperListener {
                   + this.server.getConfiguration().getLong(ALREADY_IN_TRANSITION_WAITTIME,
                     DEFAULT_ALREADY_IN_TRANSITION_WAITTIME);
               } else {
-                maxWaitTime = this.server.getConfiguration().
-                  getLong("hbase.regionserver.rpc.startup.waittime", 60000);
+                maxWaitTime = EnvironmentEdgeManager.currentTimeMillis()
+                  + this.server.getConfiguration().getLong(
+                    "hbase.regionserver.rpc.startup.waittime", 60000);
               }
             }
             try {