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 0fa48b4939d..e6db307cb66 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 @@ -55,8 +55,6 @@ .newInstance(0, 1); private Configuration conf; - private String znodeParentPath; - private static final String ZK_VERSION_PATH = "VERSION"; private static final String LOGS_PATH = "LOGS"; private static final String CONF_STORE_PATH = "CONF_STORE"; @@ -69,19 +67,20 @@ private String fencingNodePath; private String confVersionPath; - @VisibleForTesting - protected ZKCuratorManager zkManager; + private ZKCuratorManager zkManager; private List zkAcl; @Override public void initialize(Configuration config, Configuration schedConf, RMContext rmContext) throws Exception { this.conf = config; + + String znodeParentPath = conf.get( + YarnConfiguration.RM_SCHEDCONF_STORE_ZK_PARENT_PATH, + YarnConfiguration.DEFAULT_RM_SCHEDCONF_STORE_ZK_PARENT_PATH); + this.maxLogs = conf.getLong(YarnConfiguration.RM_SCHEDCONF_MAX_LOGS, YarnConfiguration.DEFAULT_RM_SCHEDCONF_ZK_MAX_LOGS); - this.znodeParentPath = - conf.get(YarnConfiguration.RM_SCHEDCONF_STORE_ZK_PARENT_PATH, - YarnConfiguration.DEFAULT_RM_SCHEDCONF_STORE_ZK_PARENT_PATH); this.zkManager = rmContext.getResourceManager().createAndStartZKManager(conf); this.zkAcl = ZKCuratorManager.getZKAcls(conf); @@ -95,36 +94,30 @@ public void initialize(Configuration config, Configuration schedConf, zkManager.createRootDirRecursively(znodeParentPath, zkAcl); zkManager.delete(fencingNodePath); - if (!zkManager.exists(logsPath)) { - zkManager.create(logsPath); - zkManager.setData(logsPath, - serializeObject(new LinkedList()), -1); + if (createNewZkPath(logsPath)) { + setZkData(logsPath, new LinkedList()); } - if (!zkManager.exists(confVersionPath)) { - zkManager.create(confVersionPath); - zkManager.setData(confVersionPath, String.valueOf(0), -1); + if (createNewZkPath(confVersionPath)) { + setZkData(confVersionPath, String.valueOf(0)); } - if (!zkManager.exists(confStorePath)) { - zkManager.create(confStorePath); + if (createNewZkPath(confStorePath)) { HashMap mapSchedConf = new HashMap<>(); for (Map.Entry entry : schedConf) { mapSchedConf.put(entry.getKey(), entry.getValue()); } - zkManager.setData(confStorePath, serializeObject(mapSchedConf), -1); + setZkData(confStorePath, mapSchedConf); long configVersion = getConfigVersion() + 1L; - zkManager.setData(confVersionPath, String.valueOf(configVersion), -1); + setZkData(confVersionPath, String.valueOf(configVersion)); } } @VisibleForTesting protected LinkedList getLogs() throws Exception { - return (LinkedList) - deserializeObject(zkManager.getData(logsPath)); + return unsafeCast(deserializeObject(getZkData(logsPath))); } - // TODO: following version-related code is taken from ZKRMStateStore @Override public Version getCurrentVersion() { return CURRENT_VERSION_INFO; @@ -133,7 +126,7 @@ public Version getCurrentVersion() { @Override public Version getConfStoreVersion() throws Exception { if (zkManager.exists(zkVersionPath)) { - byte[] data = zkManager.getData(zkVersionPath); + byte[] data = getZkData(zkVersionPath); return new VersionPBImpl(YarnServerCommonProtos.VersionProto .parseFrom(data)); } @@ -152,27 +145,29 @@ public synchronized void storeVersion() throws Exception { ((VersionPBImpl) CURRENT_VERSION_INFO).getProto().toByteArray(); if (zkManager.exists(zkVersionPath)) { - zkManager.safeSetData(zkVersionPath, data, -1, zkAcl, fencingNodePath); + safeSetZkData(zkVersionPath, data); } else { - zkManager.safeCreate(zkVersionPath, data, zkAcl, CreateMode.PERSISTENT, - zkAcl, fencingNodePath); + safeCreateZkData(zkVersionPath, data); } } @Override public void logMutation(LogMutation logMutation) throws Exception { if (maxLogs > 0) { - byte[] storedLogs = zkManager.getData(logsPath); + byte[] storedLogs = getZkData(logsPath); LinkedList logs = new LinkedList<>(); if (storedLogs != null) { - logs = (LinkedList) deserializeObject(storedLogs); + try { + logs = unsafeCast(deserializeObject(storedLogs)); + } catch (Exception e) { + LOG.error("Exception while deserializing logs", e); + } } logs.add(logMutation); if (logs.size() > maxLogs) { logs.remove(logs.removeFirst()); } - zkManager.safeSetData(logsPath, serializeObject(logs), -1, zkAcl, - fencingNodePath); + safeSetZkData(logsPath, logs); } } @@ -193,10 +188,9 @@ public void confirmMutation(LogMutation pendingMutation, mapConf.put(confChange.getKey(), confChange.getValue()); } } - zkManager.safeSetData(confStorePath, serializeObject(mapConf), -1, - zkAcl, fencingNodePath); + safeSetZkData(confStorePath, mapConf); long configVersion = getConfigVersion() + 1L; - zkManager.setData(confVersionPath, String.valueOf(configVersion), -1); + setZkData(confVersionPath, String.valueOf(configVersion)); } } @@ -205,14 +199,14 @@ public void confirmMutation(LogMutation pendingMutation, public synchronized Configuration retrieve() { byte[] serializedSchedConf; try { - serializedSchedConf = zkManager.getData(confStorePath); + serializedSchedConf = getZkData(confStorePath); } catch (Exception e) { LOG.error("Failed to retrieve configuration from zookeeper store", e); return null; } try { Map map = - (HashMap) deserializeObject(serializedSchedConf); + unsafeCast(deserializeObject(serializedSchedConf)); Configuration c = new Configuration(false); for (Map.Entry e : map.entrySet()) { c.set(e.getKey(), e.getValue()); @@ -235,6 +229,46 @@ public long getConfigVersion() throws Exception { return null; // unimplemented } + private boolean createNewZkPath(String path) throws Exception { + if (!zkManager.exists(path)) { + zkManager.create(path); + return true; + } else { + return false; + } + } + + @VisibleForTesting + protected byte[] getZkData(String path) throws Exception { + return zkManager.getData(path); + } + + @VisibleForTesting + protected void setZkData(String path, byte[] data) throws Exception { + zkManager.setData(path, data, -1); + } + + private void setZkData(String path, Object data) throws Exception { + setZkData(path, serializeObject(data)); + } + + private void setZkData(String path, String data) throws Exception { + zkManager.setData(path, data, -1); + } + + private void safeSetZkData(String path, byte[] data) throws Exception { + zkManager.safeSetData(path, data, -1, zkAcl, fencingNodePath); + } + + private void safeSetZkData(String path, Object data) throws Exception { + safeSetZkData(path, serializeObject(data)); + } + + private void safeCreateZkData(String path, byte[] data) throws Exception { + zkManager.safeCreate(path, data, zkAcl, CreateMode.PERSISTENT, + zkAcl, fencingNodePath); + } + private static String getNodePath(String root, String nodeName) { return ZKCuratorManager.getNodePath(root, nodeName); } @@ -255,4 +289,18 @@ private static Object deserializeObject(byte[] bytes) throws Exception { return ois.readObject(); } } + + /** + * Casts an object of type Object to type T. It is essential to emphasize, that + * it is an unsafe operation. + * + * @param o Object to be cast from + * @param Type to cast to + * @return + * @throws ClassCastException + */ + @SuppressWarnings("unchecked") + private static T unsafeCast(Object o) throws ClassCastException { + return (T)o; + } } 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 e67e382f71e..6b919486ab0 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 @@ -232,7 +232,7 @@ public void testDisableAuditLogs() throws Exception { YarnConfiguration.DEFAULT_RM_SCHEDCONF_STORE_ZK_PARENT_PATH); String logsPath = ZKCuratorManager.getNodePath(znodeParentPath, "LOGS"); byte[] data = null; - ((ZKConfigurationStore) confStore).zkManager.setData(logsPath, data, -1); + ((ZKConfigurationStore) confStore).setZkData(logsPath, data); Map update = new HashMap<>(); update.put("key1", "val1"); @@ -240,7 +240,7 @@ public void testDisableAuditLogs() throws Exception { new YarnConfigurationStore.LogMutation(update, TEST_USER); confStore.logMutation(mutation); - data = ((ZKConfigurationStore) confStore).zkManager.getData(logsPath); + data = ((ZKConfigurationStore) confStore).getZkData(logsPath); assertNull("Failed to Disable Audit Logs", data); }