From 14a696f369f7e3802587f57c8fff3aa51b5ab576 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Mon, 26 Sep 2016 15:00:01 +0900 Subject: [PATCH] YARN-5663. Small refactor in ZKRMStateStore. Contributed by Oleksii Dymytrov. --- .../server/resourcemanager/recovery/ZKRMStateStore.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java index 9e05f6d9ff..c24b3e9f5e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java @@ -748,17 +748,14 @@ public class ZKRMStateStore extends RMStateStore { String nodeCreatePath = getNodePath(dtMasterKeysRootPath, DELEGATION_KEY_PREFIX + delegationKey.getKeyId()); - ByteArrayOutputStream os = new ByteArrayOutputStream(); - DataOutputStream fsOut = new DataOutputStream(os); if (LOG.isDebugEnabled()) { LOG.debug("Storing RMDelegationKey_" + delegationKey.getKeyId()); } - delegationKey.write(fsOut); - try { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + try(DataOutputStream fsOut = new DataOutputStream(os)) { + delegationKey.write(fsOut); safeCreate(nodeCreatePath, os.toByteArray(), zkAcl, CreateMode.PERSISTENT); - } finally { - os.close(); } }