Skip to content

YARN-10392: Fix typos Cotext related to AMRMProxyApplicationContext #2199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+11 −11
Open

YARN-10392: Fix typos Cotext related to AMRMProxyApplicationContext #2199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public interface AMRMProxyApplicationContext {
* Gets the NMContext object.
* @return the NMContext.
*/
Context getNMCotext();
Context getNMContext();

/**
* Gets the credentials of this application.
Expand Down
2 changes: 1 addition & 1 deletion .../org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public synchronized int getLocalAMRMTokenKeyId() {
}

@Override
public Context getNMCotext() {
public Context getNMContext() {
return nmContext;
}

Expand Down
4 changes: 2 additions & 2 deletions .../java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AbstractRequestInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ public DistributedSchedulingAllocateResponse allocateForDistributedScheduling(
* @return the NMSS instance
*/
public NMStateStoreService getNMStateStore() {
if (this.appContext == null || this.appContext.getNMCotext() == null) {
if (this.appContext == null || this.appContext.getNMContext() == null) {
return null;
}
return this.appContext.getNMCotext().getNMStateStore();
return this.appContext.getNMContext().getNMStateStore();
}
}
6 changes: 3 additions & 3 deletions ...n/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/DefaultRequestInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void init(AMRMProxyApplicationContext appContext) {
private ApplicationMasterProtocol createRMClient(
AMRMProxyApplicationContext appContext, final Configuration conf)
throws IOException, InterruptedException {
if (appContext.getNMCotext().isDistributedSchedulingEnabled()) {
if (appContext.getNMContext().isDistributedSchedulingEnabled()) {
return user.doAs(
new PrivilegedExceptionAction<DistributedSchedulingAMProtocol>() {
@Override
Expand Down Expand Up @@ -144,7 +144,7 @@ public AllocateResponse allocate(final AllocateRequest request)
registerApplicationMasterForDistributedScheduling
(RegisterApplicationMasterRequest request) throws YarnException,
IOException {
if (getApplicationContext().getNMCotext()
if (getApplicationContext().getNMContext()
.isDistributedSchedulingEnabled()) {
LOG.info("Forwarding registerApplicationMasterForDistributedScheduling" +
"request to the real YARN RM");
Expand All @@ -161,7 +161,7 @@ public DistributedSchedulingAllocateResponse allocateForDistributedScheduling(
throws YarnException, IOException {
LOG.debug("Forwarding allocateForDistributedScheduling request" +
"to the real YARN RM");
if (getApplicationContext().getNMCotext()
if (getApplicationContext().getNMContext()
.isDistributedSchedulingEnabled()) {
DistributedSchedulingAllocateResponse allocateResponse =
((DistributedSchedulingAMProtocol)rmClient)
Expand Down
6 changes: 3 additions & 3 deletions ...c/main/java/org/apache/hadoop/yarn/server/nodemanager/scheduler/DistributedScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ public final class DistributedScheduler extends AbstractRequestInterceptor {

public void init(AMRMProxyApplicationContext applicationContext) {
super.init(applicationContext);
initLocal(applicationContext.getNMCotext().getNodeStatusUpdater()
initLocal(applicationContext.getNMContext().getNodeStatusUpdater()
.getRMIdentifier(),
applicationContext.getApplicationAttemptId(),
applicationContext.getNMCotext().getContainerAllocator(),
applicationContext.getNMCotext().getNMTokenSecretManager(),
applicationContext.getNMContext().getContainerAllocator(),
applicationContext.getNMContext().getNMTokenSecretManager(),
applicationContext.getUser());
}

Expand Down
2 changes: 1 addition & 1 deletion ...rcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
* <ul>
* <li>serviceContext : These services called as <b>Always On</b> services.
* Services that need to run always irrespective of the HA state of the RM.</li>
* <li>activeServiceCotext : Active services context. Services that need to run
* <li>activeServiceContext : Active services context. Services that need to run
* only on the Active RM.</li>
* </ul>
* <p>
Expand Down