diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/FSSchedulerConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/FSSchedulerConfigurationStore.java index 464ef149b1b..690a60f877a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/FSSchedulerConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/FSSchedulerConfigurationStore.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -326,6 +327,12 @@ public Configuration retrieve() throws IOException { return null; } + @Override + protected LinkedList getLogs() { + // Unimplemented. + return null; + } + @Override protected Version getConfStoreVersion() throws Exception { return null; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/InMemoryConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/InMemoryConfigurationStore.java index 47dd6bdfe61..8bd4ad07004 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/InMemoryConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/InMemoryConfigurationStore.java @@ -22,6 +22,7 @@ import org.apache.hadoop.yarn.server.records.Version; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -84,6 +85,12 @@ public long getConfigVersion() { return null; } + @Override + protected LinkedList getLogs() { + // Unimplemented. + return null; + } + @Override public Version getConfStoreVersion() throws Exception { // Does nothing. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/LeveldbConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/LeveldbConfigurationStore.java index 5da002e5a03..f921a9ae122 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/LeveldbConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/LeveldbConfigurationStore.java @@ -333,6 +333,7 @@ public Version getConfStoreVersion() throws Exception { } @VisibleForTesting + @Override protected LinkedList getLogs() throws Exception { return deserLogMutations(db.get(bytes(LOG_KEY))); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java index 597f67a8c63..4c64449290f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.Serializable; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -153,6 +154,13 @@ public void close() throws IOException {} */ protected abstract Version getConfStoreVersion() throws Exception; + /** + * Get a list of configuration mutations. + * @return list of configuration mutations. + * @throws Exception On mutation fetch failure + */ + protected abstract LinkedList getLogs() throws Exception; + /** * Persist the hard-coded schema version to the conf store. * @throws Exception On storage failure diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java index 1aee4159a38..934f70b2166 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java @@ -120,6 +120,7 @@ public void initialize(Configuration config, Configuration schedConf, } @VisibleForTesting + @Override protected LinkedList getLogs() throws Exception { return (LinkedList) deserializeObject(zkManager.getData(logsPath)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ConfigurationStoreBaseTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ConfigurationStoreBaseTest.java index 0f50b532b67..ed1159c3d30 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ConfigurationStoreBaseTest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ConfigurationStoreBaseTest.java @@ -34,16 +34,13 @@ * Base class for {@link YarnConfigurationStore} implementations. */ public abstract class ConfigurationStoreBaseTest { + static final String TEST_USER = "testUser"; + YarnConfigurationStore confStore = createConfStore(); + Configuration conf; + Configuration schedConf; + RMContext rmContext; - protected YarnConfigurationStore confStore = createConfStore(); - - protected abstract YarnConfigurationStore createConfStore(); - - protected Configuration conf; - protected Configuration schedConf; - protected RMContext rmContext; - - protected static final String TEST_USER = "testUser"; + abstract YarnConfigurationStore createConfStore(); @Before public void setUp() throws Exception { @@ -59,19 +56,11 @@ public void testConfigurationUpdate() throws Exception { confStore.initialize(conf, schedConf, rmContext); assertEquals("val1", confStore.retrieve().get("key1")); - Map update1 = new HashMap<>(); - update1.put("keyUpdate1", "valUpdate1"); - YarnConfigurationStore.LogMutation mutation1 = - new YarnConfigurationStore.LogMutation(update1, TEST_USER); - confStore.logMutation(mutation1); + prepareLogMutation("keyUpdate1", "valUpdate1"); confStore.confirmMutation(true); assertEquals("valUpdate1", confStore.retrieve().get("keyUpdate1")); - Map update2 = new HashMap<>(); - update2.put("keyUpdate2", "valUpdate2"); - YarnConfigurationStore.LogMutation mutation2 = - new YarnConfigurationStore.LogMutation(update2, TEST_USER); - confStore.logMutation(mutation2); + prepareLogMutation("keyUpdate2", "valUpdate2"); confStore.confirmMutation(false); assertNull("Configuration should not be updated", confStore.retrieve().get("keyUpdate2")); @@ -84,13 +73,18 @@ public void testNullConfigurationUpdate() throws Exception { confStore.initialize(conf, schedConf, rmContext); assertEquals("val", confStore.retrieve().get("key")); + prepareLogMutation("key", null); + confStore.confirmMutation(true); + assertNull(confStore.retrieve().get("key")); + confStore.close(); + } + + void prepareLogMutation(String key, String value) + throws Exception { Map update = new HashMap<>(); - update.put("key", null); + update.put(key, value); YarnConfigurationStore.LogMutation mutation = new YarnConfigurationStore.LogMutation(update, TEST_USER); confStore.logMutation(mutation); - confStore.confirmMutation(true); - assertNull(confStore.retrieve().get("key")); - confStore.close(); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/PersistentConfigurationStoreBaseTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/PersistentConfigurationStoreBaseTest.java new file mode 100644 index 00000000000..dfb5a29fe70 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/PersistentConfigurationStoreBaseTest.java @@ -0,0 +1,136 @@ +/** + * 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.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf; + +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.records.Version; +import org.junit.Test; + +import java.util.LinkedList; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +/** + * Base class for the persistent {@link YarnConfigurationStore} + * implementations, namely {@link TestLeveldbConfigurationStore} and + * {@link TestZKConfigurationStore}. + */ +public abstract class PersistentConfigurationStoreBaseTest extends + ConfigurationStoreBaseTest { + + abstract Version getVersion(); + + @Test + public void testGetConfigurationVersion() throws Exception { + confStore.initialize(conf, schedConf, rmContext); + long v1 = confStore.getConfigVersion(); + assertEquals(1, v1); + prepareLogMutation("keyver", "valver"); + confStore.confirmMutation(true); + long v2 = confStore.getConfigVersion(); + assertEquals(2, v2); + confStore.close(); + } + + @Test + public void testPersistConfiguration() throws Exception { + schedConf.set("key", "val"); + confStore.initialize(conf, schedConf, rmContext); + assertEquals("val", confStore.retrieve().get("key")); + confStore.close(); + + // Create a new configuration store, and check for old configuration + confStore = createConfStore(); + schedConf.set("key", "badVal"); + // Should ignore passed-in scheduler configuration. + confStore.initialize(conf, schedConf, rmContext); + assertEquals("val", confStore.retrieve().get("key")); + confStore.close(); + } + + @Test + public void testPersistUpdatedConfiguration() throws Exception { + confStore.initialize(conf, schedConf, rmContext); + assertNull(confStore.retrieve().get("key")); + + prepareLogMutation("key", "val"); + confStore.confirmMutation(true); + assertEquals("val", confStore.retrieve().get("key")); + confStore.close(); + + // Create a new configuration store, and check for updated configuration + confStore = createConfStore(); + schedConf.set("key", "badVal"); + // Should ignore passed-in scheduler configuration. + confStore.initialize(conf, schedConf, rmContext); + assertEquals("val", confStore.retrieve().get("key")); + confStore.close(); + } + + + @Test + public void testVersion() throws Exception { + confStore.initialize(conf, schedConf, rmContext); + assertNull(confStore.getConfStoreVersion()); + confStore.checkVersion(); + assertEquals(getVersion(), + confStore.getConfStoreVersion()); + confStore.close(); + } + + @Test + public void testMaxLogs() throws Exception { + conf.setLong(YarnConfiguration.RM_SCHEDCONF_MAX_LOGS, 2); + confStore.initialize(conf, schedConf, rmContext); + LinkedList logs = confStore.getLogs(); + assertEquals(0, logs.size()); + + prepareLogMutation("key1", "val1"); + logs = confStore.getLogs(); + assertEquals(1, logs.size()); + assertEquals("val1", logs.get(0).getUpdates().get("key1")); + confStore.confirmMutation(true); + assertEquals(1, logs.size()); + assertEquals("val1", logs.get(0).getUpdates().get("key1")); + + prepareLogMutation("key2", "val2"); + logs = confStore.getLogs(); + assertEquals(2, logs.size()); + assertEquals("val1", logs.get(0).getUpdates().get("key1")); + assertEquals("val2", logs.get(1).getUpdates().get("key2")); + confStore.confirmMutation(true); + assertEquals(2, logs.size()); + assertEquals("val1", logs.get(0).getUpdates().get("key1")); + assertEquals("val2", logs.get(1).getUpdates().get("key2")); + + // Next update should purge first update from logs. + prepareLogMutation("key3", "val3"); + logs = confStore.getLogs(); + assertEquals(2, logs.size()); + assertEquals("val2", logs.get(0).getUpdates().get("key2")); + assertEquals("val3", logs.get(1).getUpdates().get("key3")); + confStore.confirmMutation(true); + assertEquals(2, logs.size()); + assertEquals("val2", logs.get(0).getUpdates().get("key2")); + assertEquals("val3", logs.get(1).getUpdates().get("key3")); + confStore.close(); + } + + +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestFSSchedulerConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestFSSchedulerConfigurationStore.java index 33596c38d5e..c3ef164a937 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestFSSchedulerConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestFSSchedulerConfigurationStore.java @@ -28,21 +28,26 @@ import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hdfs.HdfsConfiguration; +import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf.YarnConfigurationStore.LogMutation; +import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; /** * Tests {@link FSSchedulerConfigurationStore}. */ public class TestFSSchedulerConfigurationStore { + private static final String TEST_USER = "test"; private FSSchedulerConfigurationStore configurationStore; private Configuration conf; private File testSchedulerConfigurationDir; @@ -88,35 +93,29 @@ public void confirmMutationWithValid() throws Exception { Configuration storeConf = configurationStore.retrieve(); compareConfig(conf, storeConf); - Map updates = new HashMap<>(); - updates.put("a", null); - updates.put("b", "bb"); - Configuration expectConfig = new Configuration(conf); expectConfig.unset("a"); expectConfig.set("b", "bb"); - LogMutation logMutation = new LogMutation(updates, "test"); - configurationStore.logMutation(logMutation); - configurationStore.confirmMutation(true); + prepareParameterizedLogMutation(configurationStore, true, + "a", null, "b", "bb"); storeConf = configurationStore.retrieve(); - assertEquals(null, storeConf.get("a")); + assertNull(storeConf.get("a")); assertEquals("bb", storeConf.get("b")); assertEquals("c", storeConf.get("c")); compareConfig(expectConfig, storeConf); - updates.put("b", "bbb"); - configurationStore.logMutation(logMutation); - configurationStore.confirmMutation(true); + prepareParameterizedLogMutation(configurationStore, true, + "a", null, "b", "bbb"); storeConf = configurationStore.retrieve(); - assertEquals(null, storeConf.get("a")); + assertNull(storeConf.get("a")); assertEquals("bbb", storeConf.get("b")); assertEquals("c", storeConf.get("c")); } @Test - public void confirmMutationWithInValid() throws Exception { + public void confirmMutationWithInvalid() throws Exception { conf.set("a", "a"); conf.set("b", "b"); conf.set("c", "c"); @@ -125,18 +124,58 @@ public void confirmMutationWithInValid() throws Exception { Configuration storeConf = configurationStore.retrieve(); compareConfig(conf, storeConf); - Map updates = new HashMap<>(); - updates.put("a", null); - updates.put("b", "bb"); - - LogMutation logMutation = new LogMutation(updates, "test"); - configurationStore.logMutation(logMutation); - configurationStore.confirmMutation(false); + prepareParameterizedLogMutation(configurationStore, false, + "a", null, "b", "bb"); storeConf = configurationStore.retrieve(); compareConfig(conf, storeConf); } + @Test + public void testFileSystemClose() throws Exception { + MiniDFSCluster hdfsCluster = null; + FileSystem fs; + Path path = new Path("/tmp/confstore"); + try { + HdfsConfiguration hdfsConfig = new HdfsConfiguration(); + hdfsCluster = new MiniDFSCluster.Builder(hdfsConfig) + .numDataNodes(1).build(); + + fs = hdfsCluster.getFileSystem(); + if (!fs.exists(path)) { + fs.mkdirs(path); + } + + FSSchedulerConfigurationStore configStore = + new FSSchedulerConfigurationStore(); + hdfsConfig.set(YarnConfiguration.SCHEDULER_CONFIGURATION_FS_PATH, + path.toString()); + configStore.initialize(hdfsConfig, hdfsConfig, null); + + // Close the FileSystem object and validate + fs.close(); + + try { + prepareParameterizedLogMutation(configStore, true, + "testkey", "testvalue"); + } catch (IOException e) { + if (e.getMessage().contains("Filesystem closed")) { + fail("FSSchedulerConfigurationStore failed to handle " + + "FileSystem close"); + } else { + fail("Should not get any exceptions"); + } + } + } finally { + assert hdfsCluster != null; + fs = hdfsCluster.getFileSystem(); + if (fs.exists(path)) { + fs.delete(path, true); + } + hdfsCluster.shutdown(); + } + } + @Test public void testFormatConfiguration() throws Exception { Configuration schedulerConf = new Configuration(); @@ -146,15 +185,14 @@ public void testFormatConfiguration() throws Exception { Configuration storedConfig = configurationStore.retrieve(); assertEquals("a", storedConfig.get("a")); configurationStore.format(); - boolean exceptionCaught = false; try { - storedConfig = configurationStore.retrieve(); + configurationStore.retrieve(); + fail("Expected an IOException with message containing \"no capacity " + + "scheduler file in\" to be thrown"); } catch (IOException e) { - if (e.getMessage().contains("no capacity scheduler file in")) { - exceptionCaught = true; - } + assertThat(e.getMessage(), + CoreMatchers.containsString("no capacity scheduler file in")); } - assertTrue(exceptionCaught); } @Test @@ -192,4 +230,27 @@ private void compareConfig(Configuration schedulerConf, schedulerConf.get(entry.getKey())); } } + + private void prepareParameterizedLogMutation( + FSSchedulerConfigurationStore configStore, + boolean validityFlag, String... values) throws Exception { + Map updates = new HashMap<>(); + String key; + String value; + + if (values.length % 2 != 0) { + throw new IllegalArgumentException("The number of parameters should be " + + "even."); + } + + for (int i = 1; i <= values.length; i += 2) { + key = values[i - 1]; + value = values[i]; + updates.put(key, value); + } + + LogMutation logMutation = new LogMutation(updates, TEST_USER); + configStore.logMutation(logMutation); + configStore.confirmMutation(validityFlag); + } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestLeveldbConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestLeveldbConfigurationStore.java index 14e4001d172..4c921206108 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestLeveldbConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestLeveldbConfigurationStore.java @@ -34,9 +34,6 @@ import org.junit.Test; import java.io.File; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -44,7 +41,8 @@ /** * Tests {@link LeveldbConfigurationStore}. */ -public class TestLeveldbConfigurationStore extends ConfigurationStoreBaseTest { +public class TestLeveldbConfigurationStore extends + PersistentConfigurationStoreBaseTest { public static final Logger LOG = LoggerFactory.getLogger(TestLeveldbConfigurationStore.class); @@ -53,8 +51,6 @@ System.getProperty("java.io.tmpdir")), TestLeveldbConfigurationStore.class.getName()); - private ResourceManager rm; - @Before public void setUp() throws Exception { super.setUp(); @@ -64,16 +60,6 @@ public void setUp() throws Exception { conf.set(YarnConfiguration.RM_SCHEDCONF_STORE_PATH, TEST_DIR.toString()); } - @Test - public void testVersioning() throws Exception { - confStore.initialize(conf, schedConf, rmContext); - assertNull(confStore.getConfStoreVersion()); - confStore.checkVersion(); - assertEquals(LeveldbConfigurationStore.CURRENT_VERSION_INFO, - confStore.getConfStoreVersion()); - confStore.close(); - } - @Test(expected = YarnConfStoreVersionIncompatibleException.class) public void testIncompatibleVersion() throws Exception { try { @@ -91,94 +77,6 @@ public void testIncompatibleVersion() throws Exception { } } - @Test - public void testPersistConfiguration() throws Exception { - schedConf.set("key", "val"); - confStore.initialize(conf, schedConf, rmContext); - assertEquals("val", confStore.retrieve().get("key")); - confStore.close(); - - // Create a new configuration store, and check for old configuration - confStore = createConfStore(); - schedConf.set("key", "badVal"); - // Should ignore passed-in scheduler configuration. - confStore.initialize(conf, schedConf, rmContext); - assertEquals("val", confStore.retrieve().get("key")); - confStore.close(); - } - - @Test - public void testPersistUpdatedConfiguration() throws Exception { - confStore.initialize(conf, schedConf, rmContext); - assertNull(confStore.retrieve().get("key")); - - Map update = new HashMap<>(); - update.put("key", "val"); - YarnConfigurationStore.LogMutation mutation = - new YarnConfigurationStore.LogMutation(update, TEST_USER); - confStore.logMutation(mutation); - confStore.confirmMutation(true); - assertEquals("val", confStore.retrieve().get("key")); - confStore.close(); - - // Create a new configuration store, and check for updated configuration - confStore = createConfStore(); - schedConf.set("key", "badVal"); - // Should ignore passed-in scheduler configuration. - confStore.initialize(conf, schedConf, rmContext); - assertEquals("val", confStore.retrieve().get("key")); - confStore.close(); - } - - @Test - public void testMaxLogs() throws Exception { - conf.setLong(YarnConfiguration.RM_SCHEDCONF_MAX_LOGS, 2); - confStore.initialize(conf, schedConf, rmContext); - LinkedList logs = - ((LeveldbConfigurationStore) confStore).getLogs(); - assertEquals(0, logs.size()); - - Map update1 = new HashMap<>(); - update1.put("key1", "val1"); - YarnConfigurationStore.LogMutation mutation = - new YarnConfigurationStore.LogMutation(update1, TEST_USER); - confStore.logMutation(mutation); - logs = ((LeveldbConfigurationStore) confStore).getLogs(); - assertEquals(1, logs.size()); - assertEquals("val1", logs.get(0).getUpdates().get("key1")); - confStore.confirmMutation(true); - assertEquals(1, logs.size()); - assertEquals("val1", logs.get(0).getUpdates().get("key1")); - - Map update2 = new HashMap<>(); - update2.put("key2", "val2"); - mutation = new YarnConfigurationStore.LogMutation(update2, TEST_USER); - confStore.logMutation(mutation); - logs = ((LeveldbConfigurationStore) confStore).getLogs(); - assertEquals(2, logs.size()); - assertEquals("val1", logs.get(0).getUpdates().get("key1")); - assertEquals("val2", logs.get(1).getUpdates().get("key2")); - confStore.confirmMutation(true); - assertEquals(2, logs.size()); - assertEquals("val1", logs.get(0).getUpdates().get("key1")); - assertEquals("val2", logs.get(1).getUpdates().get("key2")); - - // Next update should purge first update from logs. - Map update3 = new HashMap<>(); - update3.put("key3", "val3"); - mutation = new YarnConfigurationStore.LogMutation(update3, TEST_USER); - confStore.logMutation(mutation); - logs = ((LeveldbConfigurationStore) confStore).getLogs(); - assertEquals(2, logs.size()); - assertEquals("val2", logs.get(0).getUpdates().get("key2")); - assertEquals("val3", logs.get(1).getUpdates().get("key3")); - confStore.confirmMutation(true); - assertEquals(2, logs.size()); - assertEquals("val2", logs.get(0).getUpdates().get("key2")); - assertEquals("val3", logs.get(1).getUpdates().get("key3")); - confStore.close(); - } - /** * When restarting, RM should read from current state of store, including * any updates from the previous RM instance. @@ -225,4 +123,10 @@ public void testRestartReadsFromUpdatedStore() throws Exception { public YarnConfigurationStore createConfStore() { return new LeveldbConfigurationStore(); } + + @Override + Version getVersion() { + return LeveldbConfigurationStore.CURRENT_VERSION_INFO; + } + } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java index 7d8b3c13256..e50f84e393d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java @@ -18,13 +18,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf; -import org.apache.hadoop.util.curator.ZKCuratorManager; -import org.apache.hadoop.yarn.server.records.Version; -import org.apache.hadoop.yarn.server.records.impl.pb.VersionPBImpl; -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.data.ACL; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.RetryNTimes; @@ -34,8 +27,11 @@ import org.apache.hadoop.ha.HAServiceProtocol; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.service.Service; +import org.apache.hadoop.util.curator.ZKCuratorManager; import org.apache.hadoop.yarn.conf.HAUtil; import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.records.Version; +import org.apache.hadoop.yarn.server.records.impl.pb.VersionPBImpl; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore; @@ -44,14 +40,17 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.webapp.dao.QueueConfigInfo; import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo; +import org.apache.zookeeper.CreateMode; +import org.apache.zookeeper.data.ACL; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Arrays; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -62,8 +61,8 @@ /** * Tests {@link ZKConfigurationStore}. */ -public class TestZKConfigurationStore extends ConfigurationStoreBaseTest { - +public class TestZKConfigurationStore extends + PersistentConfigurationStoreBaseTest { public static final Logger LOG = LoggerFactory.getLogger(TestZKConfigurationStore.class); @@ -89,6 +88,7 @@ public static CuratorFramework setupCuratorFramework( } @Before + @Override public void setUp() throws Exception { super.setUp(); curatorTestingServer = setupCuratorServer(); @@ -108,15 +108,6 @@ public void cleanup() throws IOException { curatorTestingServer.stop(); } - @Test - public void testVersioning() throws Exception { - confStore.initialize(conf, schedConf, rmContext); - assertNull(confStore.getConfStoreVersion()); - confStore.checkVersion(); - assertEquals(ZKConfigurationStore.CURRENT_VERSION_INFO, - confStore.getConfStoreVersion()); - } - @Test(expected = YarnConfStoreVersionIncompatibleException.class) public void testIncompatibleVersion() throws Exception { confStore.initialize(conf, schedConf, rmContext); @@ -140,23 +131,6 @@ public void testIncompatibleVersion() throws Exception { confStore.checkVersion(); } - @Test - public void testPersistConfiguration() throws Exception { - schedConf.set("key", "val"); - confStore.initialize(conf, schedConf, rmContext); - assertEquals("val", confStore.retrieve().get("key")); - - assertNull(confStore.retrieve().get(YarnConfiguration.RM_HOSTNAME)); - - // Create a new configuration store, and check for old configuration - confStore = createConfStore(); - schedConf.set("key", "badVal"); - // Should ignore passed-in scheduler configuration. - confStore.initialize(conf, schedConf, rmContext); - assertEquals("val", confStore.retrieve().get("key")); - } - - @Test public void testFormatConfiguration() throws Exception { schedConf.set("key", "val"); @@ -167,87 +141,20 @@ public void testFormatConfiguration() throws Exception { } @Test - public void testGetConfigurationVersion() throws Exception { - confStore.initialize(conf, schedConf, rmContext); - long v1 = confStore.getConfigVersion(); - assertEquals(1, v1); - Map update = new HashMap<>(); - update.put("keyver", "valver"); - YarnConfigurationStore.LogMutation mutation = - new YarnConfigurationStore.LogMutation(update, TEST_USER); - confStore.logMutation(mutation); - confStore.confirmMutation(true); - long v2 = confStore.getConfigVersion(); - assertEquals(2, v2); - } - - @Test - public void testPersistUpdatedConfiguration() throws Exception { + public void testDisableAuditLogs() throws Exception { + conf.setLong(YarnConfiguration.RM_SCHEDCONF_MAX_LOGS, 0); confStore.initialize(conf, schedConf, rmContext); - assertNull(confStore.retrieve().get("key")); - - Map update = new HashMap<>(); - update.put("key", "val"); - YarnConfigurationStore.LogMutation mutation = - new YarnConfigurationStore.LogMutation(update, TEST_USER); - confStore.logMutation(mutation); - confStore.confirmMutation(true); - assertEquals("val", confStore.retrieve().get("key")); + String znodeParentPath = conf.get(YarnConfiguration. + RM_SCHEDCONF_STORE_ZK_PARENT_PATH, + YarnConfiguration.DEFAULT_RM_SCHEDCONF_STORE_ZK_PARENT_PATH); + String logsPath = ZKCuratorManager.getNodePath(znodeParentPath, "LOGS"); + byte[] data = null; + ((ZKConfigurationStore) confStore).zkManager.setData(logsPath, data, -1); - // Create a new configuration store, and check for updated configuration - confStore = createConfStore(); - schedConf.set("key", "badVal"); - // Should ignore passed-in scheduler configuration. - confStore.initialize(conf, schedConf, rmContext); - assertEquals("val", confStore.retrieve().get("key")); - } + prepareLogMutation("key1", "val1"); - @Test - public void testMaxLogs() throws Exception { - conf.setLong(YarnConfiguration.RM_SCHEDCONF_MAX_LOGS, 2); - confStore.initialize(conf, schedConf, rmContext); - LinkedList logs = - ((ZKConfigurationStore) confStore).getLogs(); - assertEquals(0, logs.size()); - - Map update1 = new HashMap<>(); - update1.put("key1", "val1"); - YarnConfigurationStore.LogMutation mutation = - new YarnConfigurationStore.LogMutation(update1, TEST_USER); - confStore.logMutation(mutation); - logs = ((ZKConfigurationStore) confStore).getLogs(); - assertEquals(1, logs.size()); - assertEquals("val1", logs.get(0).getUpdates().get("key1")); - confStore.confirmMutation(true); - assertEquals(1, logs.size()); - assertEquals("val1", logs.get(0).getUpdates().get("key1")); - - Map update2 = new HashMap<>(); - update2.put("key2", "val2"); - mutation = new YarnConfigurationStore.LogMutation(update2, TEST_USER); - confStore.logMutation(mutation); - logs = ((ZKConfigurationStore) confStore).getLogs(); - assertEquals(2, logs.size()); - assertEquals("val1", logs.get(0).getUpdates().get("key1")); - assertEquals("val2", logs.get(1).getUpdates().get("key2")); - confStore.confirmMutation(true); - assertEquals(2, logs.size()); - assertEquals("val1", logs.get(0).getUpdates().get("key1")); - assertEquals("val2", logs.get(1).getUpdates().get("key2")); - - // Next update should purge first update from logs. - Map update3 = new HashMap<>(); - update3.put("key3", "val3"); - mutation = new YarnConfigurationStore.LogMutation(update3, TEST_USER); - confStore.logMutation(mutation); - logs = ((ZKConfigurationStore) confStore).getLogs(); - assertEquals(2, logs.size()); - assertEquals("val2", logs.get(0).getUpdates().get("key2")); - assertEquals("val3", logs.get(1).getUpdates().get("key3")); - confStore.confirmMutation(true); - assertEquals(2, logs.size()); - assertEquals("val2", logs.get(0).getUpdates().get("key2")); - assertEquals("val3", logs.get(1).getUpdates().get("key3")); + data = ((ZKConfigurationStore) confStore).zkManager.getData(logsPath); + assertNull("Failed to Disable Audit Logs", data); } public Configuration createRMHAConf(String rmIds, String rmId, @@ -465,4 +372,9 @@ public void testFailoverAfterRemoveQueue() throws Exception { public YarnConfigurationStore createConfStore() { return new ZKConfigurationStore(); } + + @Override + Version getVersion() { + return ZKConfigurationStore.CURRENT_VERSION_INFO; + } }