Author: todd
Date: Thu Jul 24 06:23:41 2014
New Revision: 1613007
URL: http://svn.apache.org/r1613007
Log:
Merge trunk into branch
Added:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/security/TestNMContainerTokenSecretManager.java
- copied unchanged from r1613006,
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/security/TestNMContainerTokenSecretManager.java
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseContainerTokenSecretManager.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMStateStoreService.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMContainerTokenSecretManager.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMTokenSecretManagerInNM.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMMemoryStateStoreService.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/TestNMLeveldbStateStoreService.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/security/TestNMTokenSecretManagerInNM.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
Modified: hadoop/common/branches/MR-2841/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/CHANGES.txt?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
--- hadoop/common/branches/MR-2841/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/MR-2841/hadoop-yarn-project/CHANGES.txt Thu Jul 24
06:23:41 2014
@@ -62,6 +62,9 @@ Release 2.6.0 - UNRELEASED
YARN-2295. Refactored DistributedShell to use public APIs of protocol
records.
(Li Lu via jianhe)
+ YARN-1342. Recover container tokens upon nodemanager restart. (Jason Lowe
via
+ devaraj)
+
OPTIMIZATIONS
BUG FIXES
@@ -91,6 +94,12 @@ Release 2.6.0 - UNRELEASED
YARN-2273. NPE in ContinuousScheduling thread when we lose a node.
(Wei Yan via kasha)
+ YARN-2313. Livelock can occur in FairScheduler when there are lots of
+ running apps (Tsuyoshi Ozawa via Sandy Ryza)
+
+ YARN-2147. client lacks delegation token exception details when
+ application submit fails (Chen He via jlowe)
+
Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -297,6 +306,9 @@ Release 2.5.0 - UNRELEASED
YARN-1408 Preemption caused Invalid State Event: ACQUIRED at KILLED and
caused a task timeout for 30mins. (Sunil G via mayank)
+ YARN-2300. Improved the documentation of the sample requests for RM REST
API -
+ submitting an app. (Varun Vasudev via zjshen)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
Thu Jul 24 06:23:41 2014
@@ -194,6 +194,12 @@
<Field name="scheduleAsynchronously" />
<Bug pattern="IS2_INCONSISTENT_SYNC" />
</Match>
+ <!-- Inconsistent sync warning - updateInterval is only initialized once and
never changed -->
+ <Match>
+ <Class
name="org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler"
/>
+ <Field name="updateInterval" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
<!-- Inconsistent sync warning - numRetries is only initialized once and
never changed -->
<Match>
<Class
name="org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore" />
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseContainerTokenSecretManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseContainerTokenSecretManager.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseContainerTokenSecretManager.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseContainerTokenSecretManager.java
Thu Jul 24 06:23:41 2014
@@ -43,7 +43,7 @@ public class BaseContainerTokenSecretMan
private static Log LOG = LogFactory
.getLog(BaseContainerTokenSecretManager.class);
- private int serialNo = new SecureRandom().nextInt();
+ protected int serialNo = new SecureRandom().nextInt();
protected final ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
protected final Lock readLock = readWriteLock.readLock();
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
Thu Jul 24 06:23:41 2014
@@ -173,8 +173,8 @@ public class NodeManager extends Composi
NMContainerTokenSecretManager containerTokenSecretManager)
throws IOException {
if (nmStore.canRecover()) {
- nmTokenSecretManager.recover(nmStore.loadNMTokenState());
- // TODO: recover containerTokenSecretManager
+ nmTokenSecretManager.recover();
+ containerTokenSecretManager.recover();
}
}
@@ -190,7 +190,7 @@ public class NodeManager extends Composi
initAndStartRecoveryStore(conf);
NMContainerTokenSecretManager containerTokenSecretManager =
- new NMContainerTokenSecretManager(conf);
+ new NMContainerTokenSecretManager(conf, nmStore);
NMTokenSecretManagerInNM nmTokenSecretManager =
new NMTokenSecretManagerInNM(nmStore);
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java
Thu Jul 24 06:23:41 2014
@@ -37,6 +37,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
+import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.proto.YarnProtos.LocalResourceProto;
import org.apache.hadoop.yarn.proto.YarnServerCommonProtos.MasterKeyProto;
@@ -90,6 +91,12 @@ public class NMLeveldbStateStoreService
NM_TOKENS_KEY_PREFIX + CURRENT_MASTER_KEY_SUFFIX;
private static final String NM_TOKENS_PREV_MASTER_KEY =
NM_TOKENS_KEY_PREFIX + PREV_MASTER_KEY_SUFFIX;
+ private static final String CONTAINER_TOKENS_KEY_PREFIX =
+ "ContainerTokens/";
+ private static final String CONTAINER_TOKENS_CURRENT_MASTER_KEY =
+ CONTAINER_TOKENS_KEY_PREFIX + CURRENT_MASTER_KEY_SUFFIX;
+ private static final String CONTAINER_TOKENS_PREV_MASTER_KEY =
+ CONTAINER_TOKENS_KEY_PREFIX + PREV_MASTER_KEY_SUFFIX;
private DB db;
@@ -141,7 +148,7 @@ public class NMLeveldbStateStoreService
key.substring(0, userEndPos+1)));
}
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
} finally {
if (iter != null) {
iter.close();
@@ -260,7 +267,7 @@ public class NMLeveldbStateStoreService
try {
db.put(bytes(key), proto.toByteArray());
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
}
}
@@ -283,7 +290,7 @@ public class NMLeveldbStateStoreService
batch.close();
}
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
}
}
@@ -306,7 +313,7 @@ public class NMLeveldbStateStoreService
batch.close();
}
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
}
}
@@ -355,7 +362,7 @@ public class NMLeveldbStateStoreService
DeletionServiceDeleteTaskProto.parseFrom(entry.getValue()));
}
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
} finally {
if (iter != null) {
iter.close();
@@ -371,7 +378,7 @@ public class NMLeveldbStateStoreService
try {
db.put(bytes(key), taskProto.toByteArray());
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
}
}
@@ -381,14 +388,14 @@ public class NMLeveldbStateStoreService
try {
db.delete(bytes(key));
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
}
}
@Override
- public RecoveredNMTokenState loadNMTokenState() throws IOException {
- RecoveredNMTokenState state = new RecoveredNMTokenState();
+ public RecoveredNMTokensState loadNMTokensState() throws IOException {
+ RecoveredNMTokensState state = new RecoveredNMTokensState();
state.applicationMasterKeys =
new HashMap<ApplicationAttemptId, MasterKey>();
LeveldbIterator iter = null;
@@ -420,7 +427,7 @@ public class NMLeveldbStateStoreService
}
}
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
} finally {
if (iter != null) {
iter.close();
@@ -454,7 +461,7 @@ public class NMLeveldbStateStoreService
try {
db.delete(bytes(key));
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
}
}
@@ -468,7 +475,91 @@ public class NMLeveldbStateStoreService
try {
db.put(bytes(dbKey), pb.getProto().toByteArray());
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
+ }
+ }
+
+
+ @Override
+ public RecoveredContainerTokensState loadContainerTokensState()
+ throws IOException {
+ RecoveredContainerTokensState state = new RecoveredContainerTokensState();
+ state.activeTokens = new HashMap<ContainerId, Long>();
+ LeveldbIterator iter = null;
+ try {
+ iter = new LeveldbIterator(db);
+ iter.seek(bytes(CONTAINER_TOKENS_KEY_PREFIX));
+ final int containerTokensKeyPrefixLength =
+ CONTAINER_TOKENS_KEY_PREFIX.length();
+ while (iter.hasNext()) {
+ Entry<byte[], byte[]> entry = iter.next();
+ String fullKey = asString(entry.getKey());
+ if (!fullKey.startsWith(CONTAINER_TOKENS_KEY_PREFIX)) {
+ break;
+ }
+ String key = fullKey.substring(containerTokensKeyPrefixLength);
+ if (key.equals(CURRENT_MASTER_KEY_SUFFIX)) {
+ state.currentMasterKey = parseMasterKey(entry.getValue());
+ } else if (key.equals(PREV_MASTER_KEY_SUFFIX)) {
+ state.previousMasterKey = parseMasterKey(entry.getValue());
+ } else if (key.startsWith(ConverterUtils.CONTAINER_PREFIX)) {
+ loadContainerToken(state, fullKey, key, entry.getValue());
+ }
+ }
+ } catch (DBException e) {
+ throw new IOException(e);
+ } finally {
+ if (iter != null) {
+ iter.close();
+ }
+ }
+ return state;
+ }
+
+ private static void loadContainerToken(RecoveredContainerTokensState state,
+ String key, String containerIdStr, byte[] value) throws IOException {
+ ContainerId containerId;
+ Long expTime;
+ try {
+ containerId = ConverterUtils.toContainerId(containerIdStr);
+ expTime = Long.parseLong(asString(value));
+ } catch (IllegalArgumentException e) {
+ throw new IOException("Bad container token state for " + key, e);
+ }
+ state.activeTokens.put(containerId, expTime);
+ }
+
+ @Override
+ public void storeContainerTokenCurrentMasterKey(MasterKey key)
+ throws IOException {
+ storeMasterKey(CONTAINER_TOKENS_CURRENT_MASTER_KEY, key);
+ }
+
+ @Override
+ public void storeContainerTokenPreviousMasterKey(MasterKey key)
+ throws IOException {
+ storeMasterKey(CONTAINER_TOKENS_PREV_MASTER_KEY, key);
+ }
+
+ @Override
+ public void storeContainerToken(ContainerId containerId, Long expTime)
+ throws IOException {
+ String key = CONTAINER_TOKENS_KEY_PREFIX + containerId;
+ try {
+ db.put(bytes(key), bytes(expTime.toString()));
+ } catch (DBException e) {
+ throw new IOException(e);
+ }
+ }
+
+ @Override
+ public void removeContainerToken(ContainerId containerId)
+ throws IOException {
+ String key = CONTAINER_TOKENS_KEY_PREFIX + containerId;
+ try {
+ db.delete(bytes(key));
+ } catch (DBException e) {
+ throw new IOException(e);
}
}
@@ -554,7 +645,7 @@ public class NMLeveldbStateStoreService
try {
db.put(bytes(key), data);
} catch (DBException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e);
}
}
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
Thu Jul 24 06:23:41 2014
@@ -24,6 +24,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
+import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.proto.YarnProtos.LocalResourceProto;
import
org.apache.hadoop.yarn.proto.YarnServerNodemanagerRecoveryProtos.DeletionServiceDeleteTaskProto;
import
org.apache.hadoop.yarn.proto.YarnServerNodemanagerRecoveryProtos.LocalizedResourceProto;
@@ -80,7 +81,7 @@ public class NMNullStateStoreService ext
}
@Override
- public RecoveredNMTokenState loadNMTokenState() throws IOException {
+ public RecoveredNMTokensState loadNMTokensState() throws IOException {
throw new UnsupportedOperationException(
"Recovery not supported by this state store");
}
@@ -106,6 +107,33 @@ public class NMNullStateStoreService ext
}
@Override
+ public RecoveredContainerTokensState loadContainerTokensState()
+ throws IOException {
+ throw new UnsupportedOperationException(
+ "Recovery not supported by this state store");
+ }
+
+ @Override
+ public void storeContainerTokenCurrentMasterKey(MasterKey key)
+ throws IOException {
+ }
+
+ @Override
+ public void storeContainerTokenPreviousMasterKey(MasterKey key)
+ throws IOException {
+ }
+
+ @Override
+ public void storeContainerToken(ContainerId containerId,
+ Long expirationTime) throws IOException {
+ }
+
+ @Override
+ public void removeContainerToken(ContainerId containerId)
+ throws IOException {
+ }
+
+ @Override
protected void initStorage(Configuration conf) throws IOException {
}
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMStateStoreService.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMStateStoreService.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMStateStoreService.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMStateStoreService.java
Thu Jul 24 06:23:41 2014
@@ -31,6 +31,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
+import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.proto.YarnProtos.LocalResourceProto;
import
org.apache.hadoop.yarn.proto.YarnServerNodemanagerRecoveryProtos.DeletionServiceDeleteTaskProto;
import
org.apache.hadoop.yarn.proto.YarnServerNodemanagerRecoveryProtos.LocalizedResourceProto;
@@ -102,7 +103,7 @@ public abstract class NMStateStoreServic
}
}
- public static class RecoveredNMTokenState {
+ public static class RecoveredNMTokensState {
MasterKey currentMasterKey;
MasterKey previousMasterKey;
Map<ApplicationAttemptId, MasterKey> applicationMasterKeys;
@@ -120,6 +121,24 @@ public abstract class NMStateStoreServic
}
}
+ public static class RecoveredContainerTokensState {
+ MasterKey currentMasterKey;
+ MasterKey previousMasterKey;
+ Map<ContainerId, Long> activeTokens;
+
+ public MasterKey getCurrentMasterKey() {
+ return currentMasterKey;
+ }
+
+ public MasterKey getPreviousMasterKey() {
+ return previousMasterKey;
+ }
+
+ public Map<ContainerId, Long> getActiveTokens() {
+ return activeTokens;
+ }
+ }
+
/** Initialize the state storage */
@Override
public void serviceInit(Configuration conf) throws IOException {
@@ -193,7 +212,8 @@ public abstract class NMStateStoreServic
public abstract void removeDeletionTask(int taskId) throws IOException;
- public abstract RecoveredNMTokenState loadNMTokenState() throws IOException;
+ public abstract RecoveredNMTokensState loadNMTokensState()
+ throws IOException;
public abstract void storeNMTokenCurrentMasterKey(MasterKey key)
throws IOException;
@@ -208,6 +228,22 @@ public abstract class NMStateStoreServic
ApplicationAttemptId attempt) throws IOException;
+ public abstract RecoveredContainerTokensState loadContainerTokensState()
+ throws IOException;
+
+ public abstract void storeContainerTokenCurrentMasterKey(MasterKey key)
+ throws IOException;
+
+ public abstract void storeContainerTokenPreviousMasterKey(MasterKey key)
+ throws IOException;
+
+ public abstract void storeContainerToken(ContainerId containerId,
+ Long expirationTime) throws IOException;
+
+ public abstract void removeContainerToken(ContainerId containerId)
+ throws IOException;
+
+
protected abstract void initStorage(Configuration conf) throws IOException;
protected abstract void startStorage() throws IOException;
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMContainerTokenSecretManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMContainerTokenSecretManager.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMContainerTokenSecretManager.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMContainerTokenSecretManager.java
Thu Jul 24 06:23:41 2014
@@ -18,6 +18,7 @@
package org.apache.hadoop.yarn.server.nodemanager.security;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -33,6 +34,9 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.api.records.NodeId;
import org.apache.hadoop.yarn.security.ContainerTokenIdentifier;
import org.apache.hadoop.yarn.server.api.records.MasterKey;
+import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMNullStateStoreService;
+import org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService;
+import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredContainerTokensState;
import org.apache.hadoop.yarn.server.security.BaseContainerTokenSecretManager;
import org.apache.hadoop.yarn.server.security.MasterKeyData;
@@ -49,14 +53,74 @@ public class NMContainerTokenSecretManag
private MasterKeyData previousMasterKey;
private final TreeMap<Long, List<ContainerId>>
recentlyStartedContainerTracker;
-
+ private final NMStateStoreService stateStore;
private String nodeHostAddr;
public NMContainerTokenSecretManager(Configuration conf) {
+ this(conf, new NMNullStateStoreService());
+ }
+
+ public NMContainerTokenSecretManager(Configuration conf,
+ NMStateStoreService stateStore) {
super(conf);
recentlyStartedContainerTracker =
new TreeMap<Long, List<ContainerId>>();
+ this.stateStore = stateStore;
+ }
+
+ public synchronized void recover()
+ throws IOException {
+ RecoveredContainerTokensState state =
+ stateStore.loadContainerTokensState();
+ MasterKey key = state.getCurrentMasterKey();
+ if (key != null) {
+ super.currentMasterKey =
+ new MasterKeyData(key, createSecretKey(key.getBytes().array()));
+ }
+
+ key = state.getPreviousMasterKey();
+ if (key != null) {
+ previousMasterKey =
+ new MasterKeyData(key, createSecretKey(key.getBytes().array()));
+ }
+
+ // restore the serial number from the current master key
+ if (super.currentMasterKey != null) {
+ super.serialNo = super.currentMasterKey.getMasterKey().getKeyId() + 1;
+ }
+
+ for (Entry<ContainerId, Long> entry : state.getActiveTokens().entrySet()) {
+ ContainerId containerId = entry.getKey();
+ Long expTime = entry.getValue();
+ List<ContainerId> containerList =
+ recentlyStartedContainerTracker.get(expTime);
+ if (containerList == null) {
+ containerList = new ArrayList<ContainerId>();
+ recentlyStartedContainerTracker.put(expTime, containerList);
+ }
+ if (!containerList.contains(containerId)) {
+ containerList.add(containerId);
+ }
+ }
+ }
+
+ private void updateCurrentMasterKey(MasterKeyData key) {
+ super.currentMasterKey = key;
+ try {
+ stateStore.storeContainerTokenCurrentMasterKey(key.getMasterKey());
+ } catch (IOException e) {
+ LOG.error("Unable to update current master key in state store", e);
+ }
+ }
+
+ private void updatePreviousMasterKey(MasterKeyData key) {
+ previousMasterKey = key;
+ try {
+ stateStore.storeContainerTokenPreviousMasterKey(key.getMasterKey());
+ } catch (IOException e) {
+ LOG.error("Unable to update previous master key in state store", e);
+ }
}
/**
@@ -68,21 +132,16 @@ public class NMContainerTokenSecretManag
*/
@Private
public synchronized void setMasterKey(MasterKey masterKeyRecord) {
- LOG.info("Rolling master-key for container-tokens, got key with id "
- + masterKeyRecord.getKeyId());
- if (super.currentMasterKey == null) {
- super.currentMasterKey =
- new MasterKeyData(masterKeyRecord, createSecretKey(masterKeyRecord
- .getBytes().array()));
- } else {
- if (super.currentMasterKey.getMasterKey().getKeyId() != masterKeyRecord
- .getKeyId()) {
- // Update keys only if the key has changed.
- this.previousMasterKey = super.currentMasterKey;
- super.currentMasterKey =
- new MasterKeyData(masterKeyRecord, createSecretKey(masterKeyRecord
- .getBytes().array()));
+ // Update keys only if the key has changed.
+ if (super.currentMasterKey == null || super.currentMasterKey.getMasterKey()
+ .getKeyId() != masterKeyRecord.getKeyId()) {
+ LOG.info("Rolling master-key for container-tokens, got key with id "
+ + masterKeyRecord.getKeyId());
+ if (super.currentMasterKey != null) {
+ updatePreviousMasterKey(super.currentMasterKey);
}
+ updateCurrentMasterKey(new MasterKeyData(masterKeyRecord,
+ createSecretKey(masterKeyRecord.getBytes().array())));
}
}
@@ -137,14 +196,19 @@ public class NMContainerTokenSecretManag
removeAnyContainerTokenIfExpired();
+ ContainerId containerId = tokenId.getContainerID();
Long expTime = tokenId.getExpiryTimeStamp();
// We might have multiple containers with same expiration time.
if (!recentlyStartedContainerTracker.containsKey(expTime)) {
recentlyStartedContainerTracker
.put(expTime, new ArrayList<ContainerId>());
}
- recentlyStartedContainerTracker.get(expTime).add(tokenId.getContainerID());
-
+ recentlyStartedContainerTracker.get(expTime).add(containerId);
+ try {
+ stateStore.storeContainerToken(containerId, expTime);
+ } catch (IOException e) {
+ LOG.error("Unable to store token for container " + containerId, e);
+ }
}
protected synchronized void removeAnyContainerTokenIfExpired() {
@@ -155,6 +219,13 @@ public class NMContainerTokenSecretManag
while (containersI.hasNext()) {
Entry<Long, List<ContainerId>> containerEntry = containersI.next();
if (containerEntry.getKey() < currTime) {
+ for (ContainerId container : containerEntry.getValue()) {
+ try {
+ stateStore.removeContainerToken(container);
+ } catch (IOException e) {
+ LOG.error("Unable to remove token for container " + container, e);
+ }
+ }
containersI.remove();
} else {
break;
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMTokenSecretManagerInNM.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMTokenSecretManagerInNM.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMTokenSecretManagerInNM.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMTokenSecretManagerInNM.java
Thu Jul 24 06:23:41 2014
@@ -34,7 +34,7 @@ import org.apache.hadoop.yarn.security.N
import org.apache.hadoop.yarn.server.api.records.MasterKey;
import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMNullStateStoreService;
import org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService;
-import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredNMTokenState;
+import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredNMTokensState;
import org.apache.hadoop.yarn.server.security.BaseNMTokenSecretManager;
import org.apache.hadoop.yarn.server.security.MasterKeyData;
@@ -64,8 +64,9 @@ public class NMTokenSecretManagerInNM ex
this.stateStore = stateStore;
}
- public synchronized void recover(RecoveredNMTokenState state)
+ public synchronized void recover()
throws IOException {
+ RecoveredNMTokensState state = stateStore.loadNMTokensState();
MasterKey key = state.getCurrentMasterKey();
if (key != null) {
super.currentMasterKey =
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMMemoryStateStoreService.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMMemoryStateStoreService.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMMemoryStateStoreService.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMMemoryStateStoreService.java
Thu Jul 24 06:23:41 2014
@@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
+import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.proto.YarnProtos.LocalResourceProto;
import
org.apache.hadoop.yarn.proto.YarnServerNodemanagerRecoveryProtos.DeletionServiceDeleteTaskProto;
import
org.apache.hadoop.yarn.proto.YarnServerNodemanagerRecoveryProtos.LocalizedResourceProto;
@@ -36,7 +37,8 @@ import org.apache.hadoop.yarn.server.api
public class NMMemoryStateStoreService extends NMStateStoreService {
private Map<TrackerKey, TrackerState> trackerStates;
private Map<Integer, DeletionServiceDeleteTaskProto> deleteTasks;
- private RecoveredNMTokenState nmTokenState;
+ private RecoveredNMTokensState nmTokenState;
+ private RecoveredContainerTokensState containerTokenState;
public NMMemoryStateStoreService() {
super(NMMemoryStateStoreService.class.getName());
@@ -117,12 +119,13 @@ public class NMMemoryStateStoreService e
@Override
protected void initStorage(Configuration conf) {
- nmTokenState = new RecoveredNMTokenState();
+ nmTokenState = new RecoveredNMTokensState();
nmTokenState.applicationMasterKeys =
new HashMap<ApplicationAttemptId, MasterKey>();
+ containerTokenState = new RecoveredContainerTokensState();
+ containerTokenState.activeTokens = new HashMap<ContainerId, Long>();
trackerStates = new HashMap<TrackerKey, TrackerState>();
deleteTasks = new HashMap<Integer, DeletionServiceDeleteTaskProto>();
-
}
@Override
@@ -157,9 +160,9 @@ public class NMMemoryStateStoreService e
@Override
- public RecoveredNMTokenState loadNMTokenState() throws IOException {
+ public RecoveredNMTokensState loadNMTokensState() throws IOException {
// return a copy so caller can't modify our state
- RecoveredNMTokenState result = new RecoveredNMTokenState();
+ RecoveredNMTokensState result = new RecoveredNMTokensState();
result.currentMasterKey = nmTokenState.currentMasterKey;
result.previousMasterKey = nmTokenState.previousMasterKey;
result.applicationMasterKeys =
@@ -197,6 +200,48 @@ public class NMMemoryStateStoreService e
}
+ @Override
+ public RecoveredContainerTokensState loadContainerTokensState()
+ throws IOException {
+ // return a copy so caller can't modify our state
+ RecoveredContainerTokensState result =
+ new RecoveredContainerTokensState();
+ result.currentMasterKey = containerTokenState.currentMasterKey;
+ result.previousMasterKey = containerTokenState.previousMasterKey;
+ result.activeTokens =
+ new HashMap<ContainerId, Long>(containerTokenState.activeTokens);
+ return result;
+ }
+
+ @Override
+ public void storeContainerTokenCurrentMasterKey(MasterKey key)
+ throws IOException {
+ MasterKeyPBImpl keypb = (MasterKeyPBImpl) key;
+ containerTokenState.currentMasterKey =
+ new MasterKeyPBImpl(keypb.getProto());
+ }
+
+ @Override
+ public void storeContainerTokenPreviousMasterKey(MasterKey key)
+ throws IOException {
+ MasterKeyPBImpl keypb = (MasterKeyPBImpl) key;
+ containerTokenState.previousMasterKey =
+ new MasterKeyPBImpl(keypb.getProto());
+ }
+
+ @Override
+ public void storeContainerToken(ContainerId containerId,
+ Long expirationTime) throws IOException {
+ containerTokenState.activeTokens.put(containerId, expirationTime);
+ }
+
+ @Override
+ public void removeContainerToken(ContainerId containerId)
+ throws IOException {
+ containerTokenState.activeTokens.remove(containerId);
+ }
+
+
private static class TrackerState {
Map<Path, LocalResourceProto> inProgressMap =
new HashMap<Path, LocalResourceProto>();
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/TestNMLeveldbStateStoreService.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/TestNMLeveldbStateStoreService.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/TestNMLeveldbStateStoreService.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/recovery/TestNMLeveldbStateStoreService.java
Thu Jul 24 06:23:41 2014
@@ -27,11 +27,13 @@ import java.io.File;
import java.io.IOException;
import java.util.Map;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.service.ServiceStateException;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
+import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.LocalResource;
import org.apache.hadoop.yarn.api.records.LocalResourceType;
import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
@@ -42,12 +44,15 @@ import org.apache.hadoop.yarn.proto.Yarn
import
org.apache.hadoop.yarn.proto.YarnServerNodemanagerRecoveryProtos.LocalizedResourceProto;
import org.apache.hadoop.yarn.server.api.records.MasterKey;
import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.LocalResourceTrackerState;
+import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredContainerTokensState;
import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredDeletionServiceState;
import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredLocalizationState;
-import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredNMTokenState;
+import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredNMTokensState;
import
org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredUserResources;
import
org.apache.hadoop.yarn.server.nodemanager.recovery.records.NMDBSchemaVersion;
+import org.apache.hadoop.yarn.server.security.BaseContainerTokenSecretManager;
import org.apache.hadoop.yarn.server.security.BaseNMTokenSecretManager;
+import org.apache.hadoop.yarn.server.utils.BuilderUtils;
import org.apache.hadoop.yarn.util.ConverterUtils;
import org.junit.After;
import org.junit.Assert;
@@ -502,7 +507,7 @@ public class TestNMLeveldbStateStoreServ
@Test
public void testNMTokenStorage() throws IOException {
// test empty when no state
- RecoveredNMTokenState state = stateStore.loadNMTokenState();
+ RecoveredNMTokensState state = stateStore.loadNMTokensState();
assertNull(state.getCurrentMasterKey());
assertNull(state.getPreviousMasterKey());
assertTrue(state.getApplicationMasterKeys().isEmpty());
@@ -512,7 +517,7 @@ public class TestNMLeveldbStateStoreServ
MasterKey currentKey = secretMgr.generateKey();
stateStore.storeNMTokenCurrentMasterKey(currentKey);
restartStateStore();
- state = stateStore.loadNMTokenState();
+ state = stateStore.loadNMTokensState();
assertEquals(currentKey, state.getCurrentMasterKey());
assertNull(state.getPreviousMasterKey());
assertTrue(state.getApplicationMasterKeys().isEmpty());
@@ -521,7 +526,7 @@ public class TestNMLeveldbStateStoreServ
MasterKey prevKey = secretMgr.generateKey();
stateStore.storeNMTokenPreviousMasterKey(prevKey);
restartStateStore();
- state = stateStore.loadNMTokenState();
+ state = stateStore.loadNMTokensState();
assertEquals(currentKey, state.getCurrentMasterKey());
assertEquals(prevKey, state.getPreviousMasterKey());
assertTrue(state.getApplicationMasterKeys().isEmpty());
@@ -536,7 +541,7 @@ public class TestNMLeveldbStateStoreServ
MasterKey attemptKey2 = secretMgr.generateKey();
stateStore.storeNMTokenApplicationMasterKey(attempt2, attemptKey2);
restartStateStore();
- state = stateStore.loadNMTokenState();
+ state = stateStore.loadNMTokensState();
assertEquals(currentKey, state.getCurrentMasterKey());
assertEquals(prevKey, state.getPreviousMasterKey());
Map<ApplicationAttemptId, MasterKey> loadedAppKeys =
@@ -558,7 +563,7 @@ public class TestNMLeveldbStateStoreServ
currentKey = secretMgr.generateKey();
stateStore.storeNMTokenCurrentMasterKey(currentKey);
restartStateStore();
- state = stateStore.loadNMTokenState();
+ state = stateStore.loadNMTokensState();
assertEquals(currentKey, state.getCurrentMasterKey());
assertEquals(prevKey, state.getPreviousMasterKey());
loadedAppKeys = state.getApplicationMasterKeys();
@@ -568,10 +573,89 @@ public class TestNMLeveldbStateStoreServ
assertEquals(attemptKey3, loadedAppKeys.get(attempt3));
}
+ @Test
+ public void testContainerTokenStorage() throws IOException {
+ // test empty when no state
+ RecoveredContainerTokensState state =
+ stateStore.loadContainerTokensState();
+ assertNull(state.getCurrentMasterKey());
+ assertNull(state.getPreviousMasterKey());
+ assertTrue(state.getActiveTokens().isEmpty());
+
+ // store a master key and verify recovered
+ ContainerTokenKeyGeneratorForTest keygen =
+ new ContainerTokenKeyGeneratorForTest(new YarnConfiguration());
+ MasterKey currentKey = keygen.generateKey();
+ stateStore.storeContainerTokenCurrentMasterKey(currentKey);
+ restartStateStore();
+ state = stateStore.loadContainerTokensState();
+ assertEquals(currentKey, state.getCurrentMasterKey());
+ assertNull(state.getPreviousMasterKey());
+ assertTrue(state.getActiveTokens().isEmpty());
+
+ // store a previous key and verify recovered
+ MasterKey prevKey = keygen.generateKey();
+ stateStore.storeContainerTokenPreviousMasterKey(prevKey);
+ restartStateStore();
+ state = stateStore.loadContainerTokensState();
+ assertEquals(currentKey, state.getCurrentMasterKey());
+ assertEquals(prevKey, state.getPreviousMasterKey());
+ assertTrue(state.getActiveTokens().isEmpty());
+
+ // store a few container tokens and verify recovered
+ ContainerId cid1 = BuilderUtils.newContainerId(1, 1, 1, 1);
+ Long expTime1 = 1234567890L;
+ ContainerId cid2 = BuilderUtils.newContainerId(2, 2, 2, 2);
+ Long expTime2 = 9876543210L;
+ stateStore.storeContainerToken(cid1, expTime1);
+ stateStore.storeContainerToken(cid2, expTime2);
+ restartStateStore();
+ state = stateStore.loadContainerTokensState();
+ assertEquals(currentKey, state.getCurrentMasterKey());
+ assertEquals(prevKey, state.getPreviousMasterKey());
+ Map<ContainerId, Long> loadedActiveTokens =
+ state.getActiveTokens();
+ assertEquals(2, loadedActiveTokens.size());
+ assertEquals(expTime1, loadedActiveTokens.get(cid1));
+ assertEquals(expTime2, loadedActiveTokens.get(cid2));
+
+ // add/update/remove tokens and verify recovered
+ ContainerId cid3 = BuilderUtils.newContainerId(3, 3, 3, 3);
+ Long expTime3 = 135798642L;
+ stateStore.storeContainerToken(cid3, expTime3);
+ stateStore.removeContainerToken(cid1);
+ expTime2 += 246897531L;
+ stateStore.storeContainerToken(cid2, expTime2);
+ prevKey = currentKey;
+ stateStore.storeContainerTokenPreviousMasterKey(prevKey);
+ currentKey = keygen.generateKey();
+ stateStore.storeContainerTokenCurrentMasterKey(currentKey);
+ restartStateStore();
+ state = stateStore.loadContainerTokensState();
+ assertEquals(currentKey, state.getCurrentMasterKey());
+ assertEquals(prevKey, state.getPreviousMasterKey());
+ loadedActiveTokens = state.getActiveTokens();
+ assertEquals(2, loadedActiveTokens.size());
+ assertNull(loadedActiveTokens.get(cid1));
+ assertEquals(expTime2, loadedActiveTokens.get(cid2));
+ assertEquals(expTime3, loadedActiveTokens.get(cid3));
+ }
+
private static class NMTokenSecretManagerForTest extends
BaseNMTokenSecretManager {
public MasterKey generateKey() {
return createNewMasterKey().getMasterKey();
}
}
+
+ private static class ContainerTokenKeyGeneratorForTest extends
+ BaseContainerTokenSecretManager {
+ public ContainerTokenKeyGeneratorForTest(Configuration conf) {
+ super(conf);
+ }
+
+ public MasterKey generateKey() {
+ return createNewMasterKey().getMasterKey();
+ }
+ }
}
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/security/TestNMTokenSecretManagerInNM.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/security/TestNMTokenSecretManagerInNM.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/security/TestNMTokenSecretManagerInNM.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/security/TestNMTokenSecretManagerInNM.java
Thu Jul 24 06:23:41 2014
@@ -73,7 +73,7 @@ public class TestNMTokenSecretManagerInN
// restart and verify key is still there and token still valid
secretMgr = new NMTokenSecretManagerInNM(stateStore);
- secretMgr.recover(stateStore.loadNMTokenState());
+ secretMgr.recover();
secretMgr.setNodeId(nodeId);
assertEquals(currentKey, secretMgr.getCurrentKey());
assertTrue(secretMgr.isAppAttemptNMTokenKeyPresent(attempt1));
@@ -88,7 +88,7 @@ public class TestNMTokenSecretManagerInN
// restart and verify attempt1 key is still valid due to prev key persist
secretMgr = new NMTokenSecretManagerInNM(stateStore);
- secretMgr.recover(stateStore.loadNMTokenState());
+ secretMgr.recover();
secretMgr.setNodeId(nodeId);
assertEquals(currentKey, secretMgr.getCurrentKey());
assertFalse(secretMgr.isAppAttemptNMTokenKeyPresent(attempt1));
@@ -101,7 +101,7 @@ public class TestNMTokenSecretManagerInN
currentKey = keygen.generateKey();
secretMgr.setMasterKey(currentKey);
secretMgr = new NMTokenSecretManagerInNM(stateStore);
- secretMgr.recover(stateStore.loadNMTokenState());
+ secretMgr.recover();
secretMgr.setNodeId(nodeId);
assertEquals(currentKey, secretMgr.getCurrentKey());
assertFalse(secretMgr.isAppAttemptNMTokenKeyPresent(attempt1));
@@ -117,7 +117,7 @@ public class TestNMTokenSecretManagerInN
// remove last attempt, restart, verify both tokens are now bad
secretMgr.appFinished(attempt2.getApplicationId());
secretMgr = new NMTokenSecretManagerInNM(stateStore);
- secretMgr.recover(stateStore.loadNMTokenState());
+ secretMgr.recover();
secretMgr.setNodeId(nodeId);
assertEquals(currentKey, secretMgr.getCurrentKey());
assertFalse(secretMgr.isAppAttemptNMTokenKeyPresent(attempt1));
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
Thu Jul 24 06:23:41 2014
@@ -135,7 +135,7 @@ public class FairScheduler extends
public static final Resource CONTAINER_RESERVED =
Resources.createResource(-1);
// How often fair shares are re-calculated (ms)
- protected long UPDATE_INTERVAL = 500;
+ protected long updateInterval;
private final int UPDATE_DEBUG_FREQUENCY = 5;
private int updatesToSkipForDebug = UPDATE_DEBUG_FREQUENCY;
@@ -244,13 +244,13 @@ public class FairScheduler extends
/**
* A runnable which calls {@link FairScheduler#update()} every
- * <code>UPDATE_INTERVAL</code> milliseconds.
+ * <code>updateInterval</code> milliseconds.
*/
private class UpdateThread implements Runnable {
public void run() {
while (true) {
try {
- Thread.sleep(UPDATE_INTERVAL);
+ Thread.sleep(updateInterval);
update();
preemptTasksIfNecessary();
} catch (Exception e) {
@@ -1206,6 +1206,15 @@ public class FairScheduler extends
waitTimeBeforeKill = this.conf.getWaitTimeBeforeKill();
usePortForNodeName = this.conf.getUsePortForNodeName();
+ updateInterval = this.conf.getUpdateInterval();
+ if (updateInterval < 0) {
+ updateInterval = FairSchedulerConfiguration.DEFAULT_UPDATE_INTERVAL_MS;
+ LOG.warn(FairSchedulerConfiguration.UPDATE_INTERVAL_MS
+ + " is invalid, so using default value " +
+ + FairSchedulerConfiguration.DEFAULT_UPDATE_INTERVAL_MS
+ + " ms instead");
+ }
+
rootMetrics = FSQueueMetrics.forQueue("root", null, true, conf);
// This stores per-application scheduling information
this.applications =
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java
Thu Jul 24 06:23:41 2014
@@ -123,6 +123,11 @@ public class FairSchedulerConfiguration
protected static final String MAX_ASSIGN = CONF_PREFIX + "max.assign";
protected static final int DEFAULT_MAX_ASSIGN = -1;
+ /** The update interval for calculating resources in FairScheduler .*/
+ public static final String UPDATE_INTERVAL_MS =
+ CONF_PREFIX + "update-interval-ms";
+ public static final int DEFAULT_UPDATE_INTERVAL_MS = 500;
+
public FairSchedulerConfiguration() {
super();
}
@@ -246,6 +251,10 @@ public class FairSchedulerConfiguration
"Error reading resource config", ex);
}
}
+
+ public long getUpdateInterval() {
+ return getLong(UPDATE_INTERVAL_MS, DEFAULT_UPDATE_INTERVAL_MS);
+ }
private static int findResource(String val, String units)
throws AllocationConfigurationException {
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
Thu Jul 24 06:23:41 2014
@@ -388,7 +388,11 @@ public class DelegationTokenRenewer exte
// If user provides incorrect token then it should not be added for
// renewal.
for (DelegationTokenToRenew dtr : tokenList) {
- renewToken(dtr);
+ try {
+ renewToken(dtr);
+ } catch (IOException ioe) {
+ throw new IOException("Failed to renew token: " + dtr.token, ioe);
+ }
}
for (DelegationTokenToRenew dtr : tokenList) {
addTokenToList(dtr);
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
Thu Jul 24 06:23:41 2014
@@ -94,7 +94,7 @@ public class TestFairSchedulerPreemption
scheduler = (FairScheduler)resourceManager.getResourceScheduler();
scheduler.setClock(clock);
- scheduler.UPDATE_INTERVAL = 60 * 1000;
+ scheduler.updateInterval = 60 * 1000;
}
private void registerNodeAndSubmitApp(
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java
Thu Jul 24 06:23:41 2014
@@ -24,6 +24,7 @@ import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -673,7 +674,40 @@ public class TestDelegationTokenRenewer
Thread.sleep(200);
}
}
-
+
+ @Test(timeout=20000)
+ public void testDTRonAppSubmission()
+ throws IOException, InterruptedException, BrokenBarrierException {
+ final Credentials credsx = new Credentials();
+ final Token<?> tokenx = mock(Token.class);
+ credsx.addToken(new Text("token"), tokenx);
+ doReturn(true).when(tokenx).isManaged();
+ doThrow(new IOException("boom"))
+ .when(tokenx).renew(any(Configuration.class));
+ // fire up the renewer
+ final DelegationTokenRenewer dtr =
+ createNewDelegationTokenRenewer(conf, counter);
+ RMContext mockContext = mock(RMContext.class);
+ ClientRMService mockClientRMService = mock(ClientRMService.class);
+ when(mockContext.getClientRMService()).thenReturn(mockClientRMService);
+ InetSocketAddress sockAddr =
+ InetSocketAddress.createUnresolved("localhost", 1234);
+ when(mockClientRMService.getBindAddress()).thenReturn(sockAddr);
+ dtr.setRMContext(mockContext);
+ when(mockContext.getDelegationTokenRenewer()).thenReturn(dtr);
+ dtr.init(conf);
+ dtr.start();
+
+ try {
+ dtr.addApplicationSync(mock(ApplicationId.class), credsx, false);
+ fail("Catch IOException on app submission");
+ } catch (IOException e){
+ Assert.assertTrue(e.getMessage().contains(tokenx.toString()));
+ Assert.assertTrue(e.getCause().toString().contains("boom"));
+ }
+
+ }
+
@Test(timeout=20000)
public void testConcurrentAddApplication()
throws IOException, InterruptedException, BrokenBarrierException {
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
Thu Jul 24 06:23:41 2014
@@ -205,6 +205,12 @@ Properties that can be placed in yarn-si
instead. Defaults to true. If a queue placement policy is given in the
allocations file, this property is ignored.
+ * <<<yarn.scheduler.fair.update-interval-ms>>>
+
+ * The interval at which to lock the scheduler and recalculate fair shares,
+ recalculate demand, and check whether anything is due for preemption.
+ Defaults to 500 ms.
+
Allocation file format
The allocation file must be in XML format. The format contains five types of
Modified:
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm?rev=1613007&r1=1613006&r2=1613007&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
(original)
+++
hadoop/common/branches/MR-2841/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
Thu Jul 24 06:23:41 2014
@@ -2228,68 +2228,48 @@ _01_000001</amContainerLogs>
{
"application-id":"application_1404203615263_0001",
"application-name":"test",
- "queue":"testqueue",
- "priority":"3",
"am-container-spec":
{
"local-resources":
{
"entry":
- {
- "key":"example",
- "value":
+ [
{
- "resource":"http://www.test.com/file.txt";,
- "type":"FILE",
- "visibility":"APPLICATION",
- "size":"100",
- "timestamp":"1404203616003"
+ "key":"AppMaster.jar",
+ "value":
+ {
+
"resource":"hdfs://hdfs-namenode:9000/user/testuser/DistributedShell/demo-app/AppMaster.jar",
+ "type":"FILE",
+ "visibility":"APPLICATION",
+ "size": "43004",
+ "timestamp": "1405452071209"
+ }
}
- }
- },
- "environment":
- {
- "entry":
- {
- "key":"APP_VAR",
- "value":"ENV_SETTING"
- }
+ ]
},
"commands":
{
- "command":"/bin/sleep 5"
- },
- "service-data":
- {
- "entry":
- {
- "key":"test",
- "value":"dmFsdWUxMg"
- }
- },
- "credentials":
- {
- "tokens":null,
- "secrets":
- {
- "entry":
- {
- "key":"secret1",
- "value":"c2VjcmV0MQ"
- }
- }
+ "command":"{{JAVA_HOME}}/bin/java -Xmx10m
org.apache.hadoop.yarn.applications.distributedshell.ApplicationMaster
--container_memory 10 --container_vcores 1 --num_containers 1 --priority 0
1><LOG_DIR>/AppMaster.stdout 2><LOG_DIR>/AppMaster.stderr"
},
- "application-acls":
+ "environment":
{
"entry":
[
{
- "key":"VIEW_APP",
- "value":"testuser3, testuser4"
+ "key": "DISTRIBUTEDSHELLSCRIPTTIMESTAMP",
+ "value": "1405459400754"
+ },
+ {
+ "key": "CLASSPATH",
+ "value":
"{{CLASSPATH}}<CPS>./*<CPS>{{HADOOP_CONF_DIR}}<CPS>{{HADOOP_COMMON_HOME}}/share/hadoop/common/*<CPS>{{HADOOP_COMMON_HOME}}/share/hadoop/common/lib/*<CPS>{{HADOOP_HDFS_HOME}}/share/hadoop/hdfs/*<CPS>{{HADOOP_HDFS_HOME}}/share/hadoop/hdfs/lib/*<CPS>{{HADOOP_YARN_HOME}}/share/hadoop/yarn/*<CPS>{{HADOOP_YARN_HOME}}/share/hadoop/yarn/lib/*<CPS>./log4j.properties"
},
{
- "key":"MODIFY_APP",
- "value":"testuser1, testuser2"
+ "key": "DISTRIBUTEDSHELLSCRIPTLEN",
+ "value": "6"
+ },
+ {
+ "key": "DISTRIBUTEDSHELLSCRIPTLOCATION",
+ "value":
"hdfs://hdfs-namenode:9000/user/testuser/demo-app/shellCommands"
}
]
}
@@ -2302,16 +2282,9 @@ _01_000001</amContainerLogs>
"vCores":"1"
},
"application-type":"YARN",
- "keep-containers-across-application-attempts":"false",
- "application-tags":
- {
- "tag":
- [
- "tag 2",
- "tag1"
- ]
- }
+ "keep-containers-across-application-attempts":"false"
}
+
+---+
Response Header:
@@ -2349,22 +2322,34 @@ _01_000001</amContainerLogs>
<entry>
<key>example</key>
<value>
- <resource>http://www.test.com/file.txt</resource>
+
<resource>hdfs://hdfs-namenode:9000/user/testuser/DistributedShell/demo-app/AppMaster.jar</resource>
<type>FILE</type>
<visibility>APPLICATION</visibility>
- <size>100</size>
- <timestamp>1404204892877</timestamp>
+ <size>43004</size>
+ <timestamp>1405452071209</timestamp>
</value>
</entry>
</local-resources>
<environment>
<entry>
- <key>APP_VAR</key>
- <value>ENV_SETTING</value>
+ <key>DISTRIBUTEDSHELLSCRIPTTIMESTAMP</key>
+ <value>1405459400754</value>
+ </entry>
+ <entry>
+ <key>CLASSPATH</key>
+
<value>{{CLASSPATH}}<CPS>./*<CPS>{{HADOOP_CONF_DIR}}<CPS>{{HADOOP_COMMON_HOME}}/share/hadoop/common/*<CPS>{{HADOOP_COMMON_HOME}}/share/hadoop/common/lib/*<CPS>{{HADOOP_HDFS_HOME}}/share/hadoop/hdfs/*<CPS>{{HADOOP_HDFS_HOME}}/share/hadoop/hdfs/lib/*<CPS>{{HADOOP_YARN_HOME}}/share/hadoop/yarn/*<CPS>{{HADOOP_YARN_HOME}}/share/hadoop/yarn/lib/*<CPS>./log4j.properties</value>
+ </entry>
+ <entry>
+ <key>DISTRIBUTEDSHELLSCRIPTLEN</key>
+ <value>6</value>
+ </entry>
+ <entry>
+ <key>DISTRIBUTEDSHELLSCRIPTLOCATION</key>
+
<value>hdfs://hdfs-namenode:9000/user/testuser/demo-app/shellCommands</value>
</entry>
</environment>
<commands>
- <command>/bin/sleep 5</command>
+ <command>{{JAVA_HOME}}/bin/java -Xmx10m
org.apache.hadoop.yarn.applications.distributedshell.ApplicationMaster
--container_memory 10 --container_vcores 1 --num_containers 1 --priority 0
1><LOG_DIR>/AppMaster.stdout
2><LOG_DIR>/AppMaster.stderr</command>
</commands>
<service-data>
<entry>
