accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/3] accumulo git commit: ACCUMULO-3897 Only request shutdown to master once for tserver
Date Thu, 11 Jun 2015 22:38:08 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.7 a7c79d3d6 -> 699b8bf06
  refs/heads/master f1d1fce1c -> 7b4a3b8ab


ACCUMULO-3897 Only request shutdown to master once for tserver


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

Branch: refs/heads/1.7
Commit: 699b8bf0662be2261d64d0fb912c87cebd89c8b6
Parents: a7c79d3
Author: Josh Elser <elserj@apache.org>
Authored: Thu Jun 11 17:02:28 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Jun 11 18:37:42 2015 -0400

----------------------------------------------------------------------
 .../master/tserverOps/ShutdownTServer.java      |  1 +
 .../master/tableOps/ShutdownTServerTest.java    | 82 ++++++++++++++++++++
 2 files changed, 83 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/699b8bf0/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
b/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
index 11cd91b..171e312 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
@@ -58,6 +58,7 @@ public class ShutdownTServer extends MasterRepo {
     // only send this request once
     if (!requestedShutdown) {
       master.shutdownTServer(server);
+      requestedShutdown = true;
     }
 
     if (master.onlineTabletServers().contains(server)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/699b8bf0/server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java
b/server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java
new file mode 100644
index 0000000..2fc51b8
--- /dev/null
+++ b/server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.master.tableOps;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.HashMap;
+
+import org.apache.accumulo.core.master.thrift.TableInfo;
+import org.apache.accumulo.core.master.thrift.TabletServerStatus;
+import org.apache.accumulo.master.Master;
+import org.apache.accumulo.master.tserverOps.ShutdownTServer;
+import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection;
+import org.apache.accumulo.server.master.state.TServerInstance;
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+public class ShutdownTServerTest {
+
+  @Test
+  public void testSingleShutdown() throws Exception {
+    final TServerInstance tserver = EasyMock.createMock(TServerInstance.class);
+    final boolean force = false;
+
+    final ShutdownTServer op = new ShutdownTServer(tserver, force);
+
+    final Master master = EasyMock.createMock(Master.class);
+    final long tid = 1l;
+
+    final TServerConnection tserverCnxn = EasyMock.createMock(TServerConnection.class);
+    final TabletServerStatus status = new TabletServerStatus();
+    status.tableMap = new HashMap<>();
+    // Put in a table info record, don't care what
+    status.tableMap.put("a_table", new TableInfo());
+
+    master.shutdownTServer(tserver);
+    EasyMock.expectLastCall().once();
+    EasyMock.expect(master.onlineTabletServers()).andReturn(Collections.singleton(tserver));
+    EasyMock.expect(master.getConnection(tserver)).andReturn(tserverCnxn);
+    EasyMock.expect(tserverCnxn.getTableMap(false)).andReturn(status);
+
+    EasyMock.replay(tserver, tserverCnxn, master);
+
+    // FATE op is not ready
+    long wait = op.isReady(tid, master);
+    assertTrue("Expected wait to be greater than 0", wait > 0);
+
+    EasyMock.verify(tserver, tserverCnxn, master);
+
+    // Reset the mocks
+    EasyMock.reset(tserver, tserverCnxn, master);
+
+    // The same as above, but should not expect call shutdownTServer on master again
+    EasyMock.expect(master.onlineTabletServers()).andReturn(Collections.singleton(tserver));
+    EasyMock.expect(master.getConnection(tserver)).andReturn(tserverCnxn);
+    EasyMock.expect(tserverCnxn.getTableMap(false)).andReturn(status);
+
+    EasyMock.replay(tserver, tserverCnxn, master);
+
+    // FATE op is not ready
+    wait = op.isReady(tid, master);
+    assertTrue("Expected wait to be greater than 0", wait > 0);
+
+    EasyMock.verify(tserver, tserverCnxn, master);
+  }
+
+}


Mime
View raw message