|
|
@@ -20,39 +20,32 @@ package org.apache.hadoop.yarn.server.resourcemanager.recovery;
|
|
|
|
|
|
import org.apache.commons.logging.Log;
|
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
+import org.apache.curator.test.TestingServer;
|
|
|
import org.apache.hadoop.conf.Configuration;
|
|
|
-import org.apache.hadoop.ha.ClientBaseWithFixes;
|
|
|
-import org.apache.hadoop.util.StringUtils;
|
|
|
import org.apache.hadoop.yarn.conf.YarnConfiguration;
|
|
|
import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStoreTestBase.TestDispatcher;
|
|
|
import org.apache.hadoop.util.ZKUtil;
|
|
|
|
|
|
import org.apache.zookeeper.CreateMode;
|
|
|
-import org.apache.zookeeper.WatchedEvent;
|
|
|
-import org.apache.zookeeper.Watcher;
|
|
|
import org.apache.zookeeper.ZooDefs;
|
|
|
-import org.apache.zookeeper.ZooKeeper;
|
|
|
import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
|
|
|
+import org.junit.After;
|
|
|
import org.junit.Assert;
|
|
|
+import org.junit.Before;
|
|
|
import org.junit.Test;
|
|
|
|
|
|
-import java.io.IOException;
|
|
|
import java.security.NoSuchAlgorithmException;
|
|
|
-import java.util.concurrent.CyclicBarrier;
|
|
|
import java.util.concurrent.atomic.AtomicBoolean;
|
|
|
|
|
|
import static org.junit.Assert.assertEquals;
|
|
|
import static org.junit.Assert.assertTrue;
|
|
|
import static org.junit.Assert.fail;
|
|
|
|
|
|
-public class TestZKRMStateStoreZKClientConnections extends
|
|
|
- ClientBaseWithFixes {
|
|
|
-
|
|
|
- private static final int ZK_OP_WAIT_TIME = 3000;
|
|
|
- private static final int ZK_TIMEOUT_MS = 1000;
|
|
|
+public class TestZKRMStateStoreZKClientConnections {
|
|
|
private Log LOG =
|
|
|
LogFactory.getLog(TestZKRMStateStoreZKClientConnections.class);
|
|
|
|
|
|
+ private static final int ZK_TIMEOUT_MS = 1000;
|
|
|
private static final String DIGEST_USER_PASS="test-user:test-password";
|
|
|
private static final String TEST_AUTH_GOOD = "digest:" + DIGEST_USER_PASS;
|
|
|
private static final String DIGEST_USER_HASH;
|
|
|
@@ -66,14 +59,22 @@ public class TestZKRMStateStoreZKClientConnections extends
|
|
|
}
|
|
|
private static final String TEST_ACL = "digest:" + DIGEST_USER_HASH + ":rwcda";
|
|
|
|
|
|
+ private TestingServer testingServer;
|
|
|
+
|
|
|
+ @Before
|
|
|
+ public void setupZKServer() throws Exception {
|
|
|
+ testingServer = new TestingServer();
|
|
|
+ testingServer.start();
|
|
|
+ }
|
|
|
+
|
|
|
+ @After
|
|
|
+ public void cleanupZKServer() throws Exception {
|
|
|
+ testingServer.stop();
|
|
|
+ }
|
|
|
|
|
|
class TestZKClient {
|
|
|
|
|
|
ZKRMStateStore store;
|
|
|
- boolean forExpire = false;
|
|
|
- TestForwardingWatcher oldWatcher;
|
|
|
- TestForwardingWatcher watcher;
|
|
|
- CyclicBarrier syncBarrier = new CyclicBarrier(2);
|
|
|
|
|
|
protected class TestZKRMStateStore extends ZKRMStateStore {
|
|
|
|
|
|
@@ -83,51 +84,12 @@ public class TestZKRMStateStoreZKClientConnections extends
|
|
|
start();
|
|
|
assertTrue(znodeWorkingPath.equals(workingZnode));
|
|
|
}
|
|
|
-
|
|
|
- @Override
|
|
|
- public ZooKeeper getNewZooKeeper()
|
|
|
- throws IOException, InterruptedException {
|
|
|
- oldWatcher = watcher;
|
|
|
- watcher = new TestForwardingWatcher();
|
|
|
- return createClient(watcher, hostPort, ZK_TIMEOUT_MS);
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public synchronized void processWatchEvent(ZooKeeper zk,
|
|
|
- WatchedEvent event) throws Exception {
|
|
|
-
|
|
|
- if (forExpire) {
|
|
|
- // a hack... couldn't find a way to trigger expired event.
|
|
|
- WatchedEvent expriredEvent = new WatchedEvent(
|
|
|
- Watcher.Event.EventType.None,
|
|
|
- Watcher.Event.KeeperState.Expired, null);
|
|
|
- super.processWatchEvent(zk, expriredEvent);
|
|
|
- forExpire = false;
|
|
|
- syncBarrier.await();
|
|
|
- } else {
|
|
|
- super.processWatchEvent(zk, event);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- private class TestForwardingWatcher extends
|
|
|
- ClientBaseWithFixes.CountdownWatcher {
|
|
|
- public void process(WatchedEvent event) {
|
|
|
- super.process(event);
|
|
|
- try {
|
|
|
- if (store != null) {
|
|
|
- store.processWatchEvent(client, event);
|
|
|
- }
|
|
|
- } catch (Throwable t) {
|
|
|
- LOG.error("Failed to process watcher event " + event + ": "
|
|
|
- + StringUtils.stringifyException(t));
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
public RMStateStore getRMStateStore(Configuration conf) throws Exception {
|
|
|
String workingZnode = "/Test";
|
|
|
- conf.set(YarnConfiguration.RM_ZK_ADDRESS, hostPort);
|
|
|
+ conf.set(YarnConfiguration.RM_ZK_ADDRESS,
|
|
|
+ testingServer.getConnectString());
|
|
|
conf.set(YarnConfiguration.ZK_RM_STATE_STORE_PARENT_PATH, workingZnode);
|
|
|
this.store = new TestZKRMStateStore(conf, workingZnode);
|
|
|
return this.store;
|
|
|
@@ -147,12 +109,12 @@ public class TestZKRMStateStoreZKClientConnections extends
|
|
|
store.setRMDispatcher(dispatcher);
|
|
|
final AtomicBoolean assertionFailedInThread = new AtomicBoolean(false);
|
|
|
|
|
|
- stopServer();
|
|
|
+ testingServer.stop();
|
|
|
Thread clientThread = new Thread() {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
try {
|
|
|
- store.getDataWithRetries(path, true);
|
|
|
+ store.getData(path);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
assertionFailedInThread.set(true);
|
|
|
@@ -160,114 +122,19 @@ public class TestZKRMStateStoreZKClientConnections extends
|
|
|
}
|
|
|
};
|
|
|
Thread.sleep(2000);
|
|
|
- startServer();
|
|
|
+ testingServer.start();
|
|
|
clientThread.join();
|
|
|
Assert.assertFalse(assertionFailedInThread.get());
|
|
|
}
|
|
|
|
|
|
- @Test(timeout = 20000)
|
|
|
- public void testZKClientDisconnectAndReconnect()
|
|
|
- throws Exception {
|
|
|
-
|
|
|
- TestZKClient zkClientTester = new TestZKClient();
|
|
|
- String path = "/test";
|
|
|
- YarnConfiguration conf = new YarnConfiguration();
|
|
|
- conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, ZK_TIMEOUT_MS);
|
|
|
- ZKRMStateStore store =
|
|
|
- (ZKRMStateStore) zkClientTester.getRMStateStore(conf);
|
|
|
- TestDispatcher dispatcher = new TestDispatcher();
|
|
|
- store.setRMDispatcher(dispatcher);
|
|
|
-
|
|
|
- // trigger watch
|
|
|
- store.createWithRetries(path, null, ZooDefs.Ids.OPEN_ACL_UNSAFE,
|
|
|
- CreateMode.PERSISTENT);
|
|
|
- store.getDataWithRetries(path, true);
|
|
|
- store.setDataWithRetries(path, "newBytes".getBytes(), 0);
|
|
|
-
|
|
|
- stopServer();
|
|
|
- zkClientTester.watcher.waitForDisconnected(ZK_OP_WAIT_TIME);
|
|
|
- try {
|
|
|
- store.getDataWithRetries(path, true);
|
|
|
- fail("Expected ZKClient time out exception");
|
|
|
- } catch (Exception e) {
|
|
|
- assertTrue(e.getMessage().contains(
|
|
|
- "Wait for ZKClient creation timed out"));
|
|
|
- }
|
|
|
-
|
|
|
- // ZKRMStateStore Session restored
|
|
|
- startServer();
|
|
|
- zkClientTester.watcher.waitForConnected(ZK_OP_WAIT_TIME);
|
|
|
- byte[] ret = null;
|
|
|
- try {
|
|
|
- ret = store.getDataWithRetries(path, true);
|
|
|
- } catch (Exception e) {
|
|
|
- String error = "ZKRMStateStore Session restore failed";
|
|
|
- LOG.error(error, e);
|
|
|
- fail(error);
|
|
|
- }
|
|
|
- assertEquals("newBytes", new String(ret));
|
|
|
- }
|
|
|
-
|
|
|
- @Test(timeout = 20000)
|
|
|
- public void testZKSessionTimeout() throws Exception {
|
|
|
-
|
|
|
- TestZKClient zkClientTester = new TestZKClient();
|
|
|
- String path = "/test";
|
|
|
- YarnConfiguration conf = new YarnConfiguration();
|
|
|
- conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, ZK_TIMEOUT_MS);
|
|
|
- ZKRMStateStore store =
|
|
|
- (ZKRMStateStore) zkClientTester.getRMStateStore(conf);
|
|
|
- TestDispatcher dispatcher = new TestDispatcher();
|
|
|
- store.setRMDispatcher(dispatcher);
|
|
|
-
|
|
|
- // a hack to trigger expired event
|
|
|
- zkClientTester.forExpire = true;
|
|
|
-
|
|
|
- // trigger watch
|
|
|
- store.createWithRetries(path, null, ZooDefs.Ids.OPEN_ACL_UNSAFE,
|
|
|
- CreateMode.PERSISTENT);
|
|
|
- store.getDataWithRetries(path, true);
|
|
|
- store.setDataWithRetries(path, "bytes".getBytes(), 0);
|
|
|
-
|
|
|
- zkClientTester.syncBarrier.await();
|
|
|
- // after this point, expired event has already been processed.
|
|
|
-
|
|
|
- try {
|
|
|
- byte[] ret = store.getDataWithRetries(path, false);
|
|
|
- assertEquals("bytes", new String(ret));
|
|
|
- } catch (Exception e) {
|
|
|
- String error = "New session creation failed";
|
|
|
- LOG.error(error, e);
|
|
|
- fail(error);
|
|
|
- }
|
|
|
-
|
|
|
- // send Disconnected event from old client session to ZKRMStateStore
|
|
|
- // check the current client session is not affected.
|
|
|
- Assert.assertTrue(zkClientTester.oldWatcher != null);
|
|
|
- WatchedEvent disconnectedEvent = new WatchedEvent(
|
|
|
- Watcher.Event.EventType.None,
|
|
|
- Watcher.Event.KeeperState.Disconnected, null);
|
|
|
- zkClientTester.oldWatcher.process(disconnectedEvent);
|
|
|
- Assert.assertTrue(store.zkClient != null);
|
|
|
-
|
|
|
- zkClientTester.watcher.process(disconnectedEvent);
|
|
|
- Assert.assertTrue(store.zkClient == null);
|
|
|
- WatchedEvent connectedEvent = new WatchedEvent(
|
|
|
- Watcher.Event.EventType.None,
|
|
|
- Watcher.Event.KeeperState.SyncConnected, null);
|
|
|
- zkClientTester.watcher.process(connectedEvent);
|
|
|
- Assert.assertTrue(store.zkClient != null);
|
|
|
- Assert.assertTrue(store.zkClient == store.activeZkClient);
|
|
|
- }
|
|
|
-
|
|
|
@Test(timeout = 20000)
|
|
|
public void testSetZKAcl() {
|
|
|
TestZKClient zkClientTester = new TestZKClient();
|
|
|
YarnConfiguration conf = new YarnConfiguration();
|
|
|
conf.set(YarnConfiguration.RM_ZK_ACL, "world:anyone:rwca");
|
|
|
try {
|
|
|
- zkClientTester.store.zkClient.delete(zkClientTester.store
|
|
|
- .znodeWorkingPath, -1);
|
|
|
+ zkClientTester.store.delete(zkClientTester.store
|
|
|
+ .znodeWorkingPath);
|
|
|
fail("Shouldn't be able to delete path");
|
|
|
} catch (Exception e) {/* expected behavior */
|
|
|
}
|
Jian He