diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java index 7d57048de2fb2e351794c1e7bb9e4a82aea8ea58..8834677e414525bb99d9325787494470b769010d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java @@ -122,7 +122,6 @@ protected void serviceStop() throws Exception { super.serviceStop(); } - @Private public InetSocketAddress getBindAddress() { return this.bindAddress; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManager.java index 356b36781f1b4da3badd92b8535e80c66ae25ac5..f597f3bd37e1af1c0f86c9dbecf894e927a69bfe 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManager.java @@ -32,8 +32,6 @@ import org.apache.hadoop.yarn.api.records.ContainerReport; import org.apache.hadoop.yarn.exceptions.YarnException; -@Private -@Unstable public interface ApplicationHistoryManager { /** * This method returns Application {@link ApplicationReport} for the specified @@ -45,8 +43,6 @@ * @throws YarnException * @throws IOException */ - @Public - @Unstable ApplicationReport getApplication(ApplicationId appId) throws YarnException, IOException; @@ -64,8 +60,6 @@ ApplicationReport getApplication(ApplicationId appId) throws YarnException, * @throws YarnException * @throws IOException */ - @Public - @Unstable Map getApplications(long appsNum, long appStartedTimeBegin, long appStartedTimeEnd) throws YarnException, IOException; @@ -81,8 +75,6 @@ ApplicationReport getApplication(ApplicationId appId) throws YarnException, * @throws YarnException * @throws IOException */ - @Public - @Unstable Map getApplicationAttempts( ApplicationId appId) throws YarnException, IOException; @@ -96,8 +88,6 @@ ApplicationReport getApplication(ApplicationId appId) throws YarnException, * @throws YarnException * @throws IOException */ - @Public - @Unstable ApplicationAttemptReport getApplicationAttempt( ApplicationAttemptId appAttemptId) throws YarnException, IOException; @@ -111,8 +101,6 @@ ApplicationAttemptReport getApplicationAttempt( * @throws YarnException * @throws IOException */ - @Public - @Unstable ContainerReport getContainer(ContainerId containerId) throws YarnException, IOException; @@ -126,8 +114,6 @@ ContainerReport getContainer(ContainerId containerId) throws YarnException, * @throws YarnException * @throws IOException */ - @Public - @Unstable ContainerReport getAMContainer(ApplicationAttemptId appAttemptId) throws YarnException, IOException; @@ -142,8 +128,6 @@ ContainerReport getAMContainer(ApplicationAttemptId appAttemptId) * @throws YarnException * @throws IOException */ - @Public - @Unstable Map getContainers( ApplicationAttemptId appAttemptId) throws YarnException, IOException; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java index b8931d81abc72362806f4608c268270c939fed7d..d19101ef68ac351332a0567ca3ebbb59cad3f30a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java @@ -235,7 +235,6 @@ private ContainerReport convertToContainerReport( return containersReport; } - @Private @VisibleForTesting public ApplicationHistoryStore getHistoryStore() { return this.historyStore; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java index 4e3a1e603a38cfbf0df594ec583c0a617b62dc23..febf633f98796e9bd6b44f5be5fbecdbe0561b73 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java @@ -130,7 +130,6 @@ protected void serviceStop() throws Exception { super.serviceStop(); } - @Private @VisibleForTesting ApplicationHistoryClientService getClientService() { return this.ahsClientService; @@ -140,7 +139,6 @@ private InetSocketAddress getListenerAddress() { return this.webApp.httpServer().getConnectorAddress(0); } - @Private @VisibleForTesting public int getPort() { return this.getListenerAddress().getPort(); @@ -149,13 +147,11 @@ public int getPort() { /** * @return ApplicationTimelineStore */ - @Private @VisibleForTesting public TimelineStore getTimelineStore() { return timelineStore; } - @Private @VisibleForTesting ApplicationHistoryManager getApplicationHistoryManager() { return this.historyManager; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryWriter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryWriter.java index 09ba36df964bc78385dc08b991cd5941b784e4f7..e1455ffe047a5be09a318c7b53cfc687a61d23c9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryWriter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryWriter.java @@ -35,8 +35,6 @@ * {@link ApplicationAttemptStartData}, {@link ApplicationAttemptFinishData}, * {@link ContainerStartData} and {@link ContainerFinishData}. */ -@Private -@Unstable public interface ApplicationHistoryWriter { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java index fa2da44f5f2add08c9b8cf5dea1a78ac8004ff16..97bbbe6f0f5f8e8a3eefa052dfb94bcec0ad207d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java @@ -84,8 +84,6 @@ * open a file, while {@link #applicationFinished(ApplicationFinishData)} is * supposed to be last writing operation and will close the file. */ -@Public -@Unstable public class FileSystemApplicationHistoryStore extends AbstractService implements ApplicationHistoryStore { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/MemoryApplicationHistoryStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/MemoryApplicationHistoryStore.java index c226ad3c90e61e02f284d7418c6faef45d4d5746..21b7b840ccf25844812bcdef259d11ab4c34776d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/MemoryApplicationHistoryStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/MemoryApplicationHistoryStore.java @@ -48,8 +48,6 @@ * store. * */ -@Private -@Unstable public class MemoryApplicationHistoryStore extends AbstractService implements ApplicationHistoryStore { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/NullApplicationHistoryStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/NullApplicationHistoryStore.java index 3660c10befd3aca24dca76d6a839cf16aae64a38..030a2fd06b12e4a2929572a2a8b8a327d4152b71 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/NullApplicationHistoryStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/NullApplicationHistoryStore.java @@ -43,8 +43,6 @@ * implementation is used, no history data will be persisted. * */ -@Unstable -@Private public class NullApplicationHistoryStore extends AbstractService implements ApplicationHistoryStore { @@ -124,4 +122,4 @@ public ContainerHistoryData getAMContainer(ApplicationAttemptId appAttemptId) return Collections.emptyMap(); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptFinishData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptFinishData.java index 7ba51af800a179dc0ba7146ee1b9f85206af6371..de12dfec119915b78ef1a58b5cc6a306af078fba 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptFinishData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptFinishData.java @@ -29,12 +29,8 @@ * The class contains the fields that can be determined when * RMAppAttempt finishes, and that need to be stored persistently. */ -@Public -@Unstable public abstract class ApplicationAttemptFinishData { - @Public - @Unstable public static ApplicationAttemptFinishData newInstance( ApplicationAttemptId appAttemptId, String diagnosticsInfo, String trackingURL, FinalApplicationStatus finalApplicationStatus, @@ -49,46 +45,26 @@ public static ApplicationAttemptFinishData newInstance( return appAttemptFD; } - @Public - @Unstable public abstract ApplicationAttemptId getApplicationAttemptId(); - @Public - @Unstable public abstract void setApplicationAttemptId( ApplicationAttemptId applicationAttemptId); - @Public - @Unstable public abstract String getTrackingURL(); - @Public - @Unstable public abstract void setTrackingURL(String trackingURL); - @Public - @Unstable public abstract String getDiagnosticsInfo(); - @Public - @Unstable public abstract void setDiagnosticsInfo(String diagnosticsInfo); - @Public - @Unstable public abstract FinalApplicationStatus getFinalApplicationStatus(); - @Public - @Unstable public abstract void setFinalApplicationStatus( FinalApplicationStatus finalApplicationStatus); - @Public - @Unstable public abstract YarnApplicationAttemptState getYarnApplicationAttemptState(); - @Public - @Unstable public abstract void setYarnApplicationAttemptState( YarnApplicationAttemptState yarnApplicationAttemptState); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptHistoryData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptHistoryData.java index b759ab18035ce351d93b5b5d83fa00aef6a50f58..a01dbad98eeb8a420a21988c76d81df653d3a6f9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptHistoryData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptHistoryData.java @@ -29,8 +29,6 @@ * The class contains all the fields that are stored persistently for * RMAppAttempt. */ -@Public -@Unstable public class ApplicationAttemptHistoryData { private ApplicationAttemptId applicationAttemptId; @@ -49,8 +47,6 @@ private YarnApplicationAttemptState yarnApplicationAttemptState; - @Public - @Unstable public static ApplicationAttemptHistoryData newInstance( ApplicationAttemptId appAttemptId, String host, int rpcPort, ContainerId masterContainerId, String diagnosticsInfo, @@ -69,100 +65,68 @@ public static ApplicationAttemptHistoryData newInstance( return appAttemptHD; } - @Public - @Unstable public ApplicationAttemptId getApplicationAttemptId() { return applicationAttemptId; } - @Public - @Unstable public void setApplicationAttemptId(ApplicationAttemptId applicationAttemptId) { this.applicationAttemptId = applicationAttemptId; } - @Public - @Unstable public String getHost() { return host; } - @Public - @Unstable public void setHost(String host) { this.host = host; } - @Public - @Unstable public int getRPCPort() { return rpcPort; } - @Public - @Unstable public void setRPCPort(int rpcPort) { this.rpcPort = rpcPort; } - @Public - @Unstable public String getTrackingURL() { return trackingURL; } - @Public - @Unstable public void setTrackingURL(String trackingURL) { this.trackingURL = trackingURL; } - @Public - @Unstable public String getDiagnosticsInfo() { return diagnosticsInfo; } - @Public - @Unstable public void setDiagnosticsInfo(String diagnosticsInfo) { this.diagnosticsInfo = diagnosticsInfo; } - @Public - @Unstable public FinalApplicationStatus getFinalApplicationStatus() { return finalApplicationStatus; } - @Public - @Unstable public void setFinalApplicationStatus( FinalApplicationStatus finalApplicationStatus) { this.finalApplicationStatus = finalApplicationStatus; } - @Public - @Unstable public ContainerId getMasterContainerId() { return masterContainerId; } - @Public - @Unstable public void setMasterContainerId(ContainerId masterContainerId) { this.masterContainerId = masterContainerId; } - @Public - @Unstable public YarnApplicationAttemptState getYarnApplicationAttemptState() { return yarnApplicationAttemptState; } - @Public - @Unstable public void setYarnApplicationAttemptState( YarnApplicationAttemptState yarnApplicationAttemptState) { this.yarnApplicationAttemptState = yarnApplicationAttemptState; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptStartData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptStartData.java index 7ca43fa8ea6fbf60f1025e1c478b8fb59948c0d3..d2dd8454288724230ee5a5935a4eea61166acd5b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptStartData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationAttemptStartData.java @@ -28,12 +28,8 @@ * The class contains the fields that can be determined when * RMAppAttempt starts, and that need to be stored persistently. */ -@Public -@Unstable public abstract class ApplicationAttemptStartData { - @Public - @Unstable public static ApplicationAttemptStartData newInstance( ApplicationAttemptId appAttemptId, String host, int rpcPort, ContainerId masterContainerId) { @@ -46,37 +42,21 @@ public static ApplicationAttemptStartData newInstance( return appAttemptSD; } - @Public - @Unstable public abstract ApplicationAttemptId getApplicationAttemptId(); - @Public - @Unstable public abstract void setApplicationAttemptId( ApplicationAttemptId applicationAttemptId); - @Public - @Unstable public abstract String getHost(); - @Public - @Unstable public abstract void setHost(String host); - @Public - @Unstable public abstract int getRPCPort(); - @Public - @Unstable public abstract void setRPCPort(int rpcPort); - @Public - @Unstable public abstract ContainerId getMasterContainerId(); - @Public - @Unstable public abstract void setMasterContainerId(ContainerId masterContainerId); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationFinishData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationFinishData.java index 997fa6cbfd8f7d74d2ed5f56845c46cf9302d435..85058e7e77b47239f6906f7d94d30ba67310094b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationFinishData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationFinishData.java @@ -29,12 +29,8 @@ * The class contains the fields that can be determined when RMApp * finishes, and that need to be stored persistently. */ -@Public -@Unstable public abstract class ApplicationFinishData { - @Public - @Unstable public static ApplicationFinishData newInstance(ApplicationId applicationId, long finishTime, String diagnosticsInfo, FinalApplicationStatus finalApplicationStatus, @@ -49,45 +45,25 @@ public static ApplicationFinishData newInstance(ApplicationId applicationId, return appFD; } - @Public - @Unstable public abstract ApplicationId getApplicationId(); - @Public - @Unstable public abstract void setApplicationId(ApplicationId applicationId); - @Public - @Unstable public abstract long getFinishTime(); - @Public - @Unstable public abstract void setFinishTime(long finishTime); - @Public - @Unstable public abstract String getDiagnosticsInfo(); - @Public - @Unstable public abstract void setDiagnosticsInfo(String diagnosticsInfo); - @Public - @Unstable public abstract FinalApplicationStatus getFinalApplicationStatus(); - @Public - @Unstable public abstract void setFinalApplicationStatus( FinalApplicationStatus finalApplicationStatus); - @Public - @Unstable public abstract YarnApplicationState getYarnApplicationState(); - @Public - @Unstable public abstract void setYarnApplicationState( YarnApplicationState yarnApplicationState); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationHistoryData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationHistoryData.java index b7d16f3c412ba354c3c3dedcd938824d1e12f859..80d595f3200d40fc1299810d2a3468134320c63b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationHistoryData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationHistoryData.java @@ -28,8 +28,6 @@ * The class contains all the fields that are stored persistently for * RMApp. */ -@Public -@Unstable public class ApplicationHistoryData { private ApplicationId applicationId; @@ -54,8 +52,6 @@ private YarnApplicationState yarnApplicationState; - @Public - @Unstable public static ApplicationHistoryData newInstance(ApplicationId applicationId, String applicationName, String applicationType, String queue, String user, long submitTime, long startTime, long finishTime, @@ -76,135 +72,91 @@ public static ApplicationHistoryData newInstance(ApplicationId applicationId, return appHD; } - @Public - @Unstable public ApplicationId getApplicationId() { return applicationId; } - @Public - @Unstable public void setApplicationId(ApplicationId applicationId) { this.applicationId = applicationId; } - @Public - @Unstable public String getApplicationName() { return applicationName; } - @Public - @Unstable public void setApplicationName(String applicationName) { this.applicationName = applicationName; } - @Public - @Unstable public String getApplicationType() { return applicationType; } - @Public - @Unstable public void setApplicationType(String applicationType) { this.applicationType = applicationType; } - @Public - @Unstable public String getUser() { return user; } - @Public - @Unstable public void setUser(String user) { this.user = user; } - @Public - @Unstable public String getQueue() { return queue; } - @Public - @Unstable public void setQueue(String queue) { this.queue = queue; } - @Public - @Unstable public long getSubmitTime() { return submitTime; } - @Public - @Unstable public void setSubmitTime(long submitTime) { this.submitTime = submitTime; } - @Public - @Unstable public long getStartTime() { return startTime; } - @Public - @Unstable public void setStartTime(long startTime) { this.startTime = startTime; } - @Public - @Unstable public long getFinishTime() { return finishTime; } - @Public - @Unstable public void setFinishTime(long finishTime) { this.finishTime = finishTime; } - @Public - @Unstable public String getDiagnosticsInfo() { return diagnosticsInfo; } - @Public - @Unstable public void setDiagnosticsInfo(String diagnosticsInfo) { this.diagnosticsInfo = diagnosticsInfo; } - @Public - @Unstable public FinalApplicationStatus getFinalApplicationStatus() { return finalApplicationStatus; } - @Public - @Unstable public void setFinalApplicationStatus( FinalApplicationStatus finalApplicationStatus) { this.finalApplicationStatus = finalApplicationStatus; } - @Public - @Unstable public YarnApplicationState getYarnApplicationState() { return this.yarnApplicationState; } - @Public - @Unstable public void setYarnApplicationState(YarnApplicationState yarnApplicationState) { this.yarnApplicationState = yarnApplicationState; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationStartData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationStartData.java index 6bc132392030a2115eceb721e10b9be4b738b030..e3997fa3bb6d2c5d997ec7deeb150f387c7d761d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationStartData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationStartData.java @@ -27,12 +27,8 @@ * The class contains the fields that can be determined when RMApp * starts, and that need to be stored persistently. */ -@Public -@Unstable public abstract class ApplicationStartData { - @Public - @Unstable public static ApplicationStartData newInstance(ApplicationId applicationId, String applicationName, String applicationType, String queue, String user, long submitTime, long startTime) { @@ -47,60 +43,32 @@ public static ApplicationStartData newInstance(ApplicationId applicationId, return appSD; } - @Public - @Unstable public abstract ApplicationId getApplicationId(); - @Public - @Unstable public abstract void setApplicationId(ApplicationId applicationId); - @Public - @Unstable public abstract String getApplicationName(); - @Public - @Unstable public abstract void setApplicationName(String applicationName); - @Public - @Unstable public abstract String getApplicationType(); - @Public - @Unstable public abstract void setApplicationType(String applicationType); - @Public - @Unstable public abstract String getUser(); - @Public - @Unstable public abstract void setUser(String user); - @Public - @Unstable public abstract String getQueue(); - @Public - @Unstable public abstract void setQueue(String queue); - @Public - @Unstable public abstract long getSubmitTime(); - @Public - @Unstable public abstract void setSubmitTime(long submitTime); - @Public - @Unstable public abstract long getStartTime(); - @Public - @Unstable public abstract void setStartTime(long startTime); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerFinishData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerFinishData.java index 5eb9ddbd38dfe5510ab00f9b56376d2aecc76f34..36e839d640000abcae54d75941e99d859099b987 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerFinishData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerFinishData.java @@ -28,12 +28,8 @@ * The class contains the fields that can be determined when * RMContainer finishes, and that need to be stored persistently. */ -@Public -@Unstable public abstract class ContainerFinishData { - @Public - @Unstable public static ContainerFinishData newInstance(ContainerId containerId, long finishTime, String diagnosticsInfo, int containerExitCode, ContainerState containerState) { @@ -47,44 +43,24 @@ public static ContainerFinishData newInstance(ContainerId containerId, return containerFD; } - @Public - @Unstable public abstract ContainerId getContainerId(); - @Public - @Unstable public abstract void setContainerId(ContainerId containerId); - @Public - @Unstable public abstract long getFinishTime(); - @Public - @Unstable public abstract void setFinishTime(long finishTime); - @Public - @Unstable public abstract String getDiagnosticsInfo(); - @Public - @Unstable public abstract void setDiagnosticsInfo(String diagnosticsInfo); - @Public - @Unstable public abstract int getContainerExitStatus(); - @Public - @Unstable public abstract void setContainerExitStatus(int containerExitStatus); - @Public - @Unstable public abstract ContainerState getContainerState(); - @Public - @Unstable public abstract void setContainerState(ContainerState containerState); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerHistoryData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerHistoryData.java index e6061853128e7c5c01567dd6c8c5a16b6a7a6108..562f6c5321f1de92f98f2c9fd81a2414a3d5f2d2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerHistoryData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerHistoryData.java @@ -30,8 +30,6 @@ * The class contains all the fields that are stored persistently for * RMContainer. */ -@Public -@Unstable public class ContainerHistoryData { private ContainerId containerId; @@ -52,8 +50,6 @@ private ContainerState containerState; - @Public - @Unstable public static ContainerHistoryData newInstance(ContainerId containerId, Resource allocatedResource, NodeId assignedNode, Priority priority, long startTime, long finishTime, String diagnosticsInfo, @@ -71,110 +67,74 @@ public static ContainerHistoryData newInstance(ContainerId containerId, return containerHD; } - @Public - @Unstable public ContainerId getContainerId() { return containerId; } - @Public - @Unstable public void setContainerId(ContainerId containerId) { this.containerId = containerId; } - @Public - @Unstable public Resource getAllocatedResource() { return allocatedResource; } - @Public - @Unstable public void setAllocatedResource(Resource resource) { this.allocatedResource = resource; } - @Public - @Unstable public NodeId getAssignedNode() { return assignedNode; } - @Public - @Unstable public void setAssignedNode(NodeId nodeId) { this.assignedNode = nodeId; } - @Public - @Unstable public Priority getPriority() { return priority; } - @Public - @Unstable public void setPriority(Priority priority) { this.priority = priority; } - @Public - @Unstable public long getStartTime() { return startTime; } - @Public - @Unstable public void setStartTime(long startTime) { this.startTime = startTime; } - @Public - @Unstable public long getFinishTime() { return finishTime; } - @Public - @Unstable public void setFinishTime(long finishTime) { this.finishTime = finishTime; } - @Public - @Unstable public String getDiagnosticsInfo() { return diagnosticsInfo; } - @Public - @Unstable public void setDiagnosticsInfo(String diagnosticsInfo) { this.diagnosticsInfo = diagnosticsInfo; } - @Public - @Unstable public int getContainerExitStatus() { return containerExitStatus; } - @Public - @Unstable public void setContainerExitStatus(int containerExitStatus) { this.containerExitStatus = containerExitStatus; } - @Public - @Unstable public ContainerState getContainerState() { return containerState; } - @Public - @Unstable public void setContainerState(ContainerState containerState) { this.containerState = containerState; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerStartData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerStartData.java index 0c6dd81a63f3be5fefd846fe2a6fef83930f4efe..9b21baf0f4efd6302c039e77651b7232b30c2a5a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerStartData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ContainerStartData.java @@ -30,12 +30,8 @@ * The class contains the fields that can be determined when * RMContainer starts, and that need to be stored persistently. */ -@Public -@Unstable public abstract class ContainerStartData { - @Public - @Unstable public static ContainerStartData newInstance(ContainerId containerId, Resource allocatedResource, NodeId assignedNode, Priority priority, long startTime) { @@ -49,44 +45,24 @@ public static ContainerStartData newInstance(ContainerId containerId, return containerSD; } - @Public - @Unstable public abstract ContainerId getContainerId(); - @Public - @Unstable public abstract void setContainerId(ContainerId containerId); - @Public - @Unstable public abstract Resource getAllocatedResource(); - @Public - @Unstable public abstract void setAllocatedResource(Resource resource); - @Public - @Unstable public abstract NodeId getAssignedNode(); - @Public - @Unstable public abstract void setAssignedNode(NodeId nodeId); - @Public - @Unstable public abstract Priority getPriority(); - @Public - @Unstable public abstract void setPriority(Priority priority); - @Public - @Unstable public abstract long getStartTime(); - @Public - @Unstable public abstract void setStartTime(long startTime); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java index 755127b20b22812763cd0ed312459110413a75d7..04612669852866fa7b8a1fba967fc7fdcbe19f70 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java @@ -360,8 +360,6 @@ public Response getContainerLogsInfo( @GET @Path("/containers/{containerid}/logs/{filename}") @Produces({ MediaType.TEXT_PLAIN }) - @Public - @Unstable public Response getContainerLogFile(@Context HttpServletRequest req, @Context HttpServletResponse res, @PathParam(YarnWebServiceParams.CONTAINER_ID) String containerIdStr, @@ -381,8 +379,6 @@ public Response getContainerLogFile(@Context HttpServletRequest req, @GET @Path("/containerlogs/{containerid}/{filename}") @Produces({ MediaType.TEXT_PLAIN + "; " + JettyUtils.UTF_8 }) - @Public - @Unstable public Response getLogs(@Context HttpServletRequest req, @Context HttpServletResponse res, @PathParam(YarnWebServiceParams.CONTAINER_ID) String containerIdStr, @@ -608,7 +604,6 @@ private Response getContainerLogMeta(ApplicationId appId, String appOwner, } } - @Private @VisibleForTesting public static String getNoRedirectWarning() { return "We do not have NodeManager web address, so we can not " @@ -625,7 +620,6 @@ private String getAbsoluteNMWebAddress(String nmWebAddress) { } @VisibleForTesting - @Private public String getNMWebAddressFromRM(Configuration configuration, String nodeId) throws ClientHandlerException, UniformInterfaceException, JSONException { @@ -634,4 +628,4 @@ public String getNMWebAddressFromRM(Configuration configuration, return nodeInfo.has("nodeHTTPAddress") ? nodeInfo.getString("nodeHTTPAddress") : null; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityIdentifier.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityIdentifier.java index 60a9aa74b61effce847da21b06bd73c72cf4583f..3c5d4c4bb84573af06ec1d6665f97e25e1f1dce3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityIdentifier.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityIdentifier.java @@ -24,8 +24,6 @@ /** * The unique identifier for an entity */ -@Private -@Unstable public class EntityIdentifier implements Comparable { private String id; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/KeyValueBasedTimelineStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/KeyValueBasedTimelineStore.java index 82db770191b7017029c94fd9954b04a213574106..ef73ef77b9040d201ff91dfc1243a524ccccfba9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/KeyValueBasedTimelineStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/KeyValueBasedTimelineStore.java @@ -59,8 +59,6 @@ * The methods are synchronized to avoid concurrent modifications. * */ -@Private -@Unstable abstract class KeyValueBasedTimelineStore extends AbstractService implements TimelineStore { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java index e3db1dcc28ac8f166fb0cb9fc1dc19bb6677bfdc..97692e27d57d1e5b922d6dfb04743ef5b6b341af 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java @@ -120,7 +120,6 @@ private static final org.slf4j.Logger LOG = LoggerFactory .getLogger(LeveldbTimelineStore.class); - @Private @VisibleForTesting static final String FILENAME = "leveldb-timeline-store.ldb"; @@ -156,7 +155,6 @@ private static final Version CURRENT_VERSION_INFO = Version .newInstance(1, 0); - @Private @VisibleForTesting static final FsPermission LEVELDB_DIR_UMASK = FsPermission .createImmutable((short) 0700); @@ -998,7 +996,6 @@ public TimelinePutResponse put(TimelineEntities entities) { } } - @Private @VisibleForTesting public TimelinePutResponse putWithNoDomainId(TimelineEntities entities) { try { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java index 5c2db0004e03106d3e99843f5d273a6384d0fa95..909b16e0d755b18c8a99142da13ce29e8932125a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java @@ -35,8 +35,6 @@ * The methods are synchronized to avoid concurrent modification on the memory. * */ -@Private -@Unstable public class MemoryTimelineStore extends KeyValueBasedTimelineStore { static class HashMapStoreAdapter diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/RollingLevelDBTimelineStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/RollingLevelDBTimelineStore.java index 1ac170c25056c184a0de83caf47044f90b6f0477..14ec1b7021f8fdb03e0974ad435801f15d39f5ab 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/RollingLevelDBTimelineStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/RollingLevelDBTimelineStore.java @@ -190,7 +190,6 @@ LinkedHashMap.class, LINKED_HASH_MAP_224_CODE, fstConf224); } - @Private @VisibleForTesting static final String FILENAME = "leveldb-timeline-store"; static final String DOMAIN = "domain-ldb"; @@ -220,7 +219,6 @@ private static long writeBatchSize = 10000; - @Private @VisibleForTesting static final FsPermission LEVELDB_DIR_UMASK = FsPermission .createImmutable((short) 0700); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/TimelineStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/TimelineStore.java index 3f6f4abbf1be6475fd094fdcdc185bb4197b2ca1..a15f7f8627c6e98edeed472e04b929a605d65a2a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/TimelineStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/TimelineStore.java @@ -23,8 +23,6 @@ import org.apache.hadoop.service.Service; import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity; -@Private -@Unstable public interface TimelineStore extends Service, TimelineReader, TimelineWriter { @@ -34,7 +32,6 @@ * The filter key is case sensitive. Users are supposed not to use the key * reserved by the timeline system. */ - @Private enum SystemFilter { ENTITY_OWNER } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/recovery/TimelineStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/recovery/TimelineStateStore.java index 7bfda55d13b2852f0a96132e204705e655c64656..420880207c932db3db8ce1e5b5ee0da55c00cf51 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/recovery/TimelineStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/recovery/TimelineStateStore.java @@ -31,8 +31,6 @@ import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier; -@Private -@Unstable /** * Base class for timeline service state storage. * Storage implementations need to implement blocking store and load methods diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineACLsManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineACLsManager.java index 6c32eecc5a670427a142135708731a93e87afaee..505343dc235c59a1b8d016852355246f3c2ffb2f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineACLsManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineACLsManager.java @@ -45,7 +45,6 @@ /** * TimelineACLsManager check the entity level timeline data access. */ -@Private public class TimelineACLsManager { private static final Logger LOG = LoggerFactory. @@ -171,7 +170,6 @@ public boolean checkAccess(UserGroupInformation callerUGI, return false; } - @Private @VisibleForTesting public AdminACLsManager setAdminACLsManager(AdminACLsManager adminAclsManager) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineV1DelegationTokenSecretManagerService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineV1DelegationTokenSecretManagerService.java index 85d8ccab3c35100af0b627277703c172ec7f0497..5abf5d3b83bb96a81002e4e2fd89bf4760ee03ae 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineV1DelegationTokenSecretManagerService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineV1DelegationTokenSecretManagerService.java @@ -38,8 +38,6 @@ /** * The service wrapper of {@link TimelineV1DelegationTokenSecretManager}. */ -@Private -@Unstable public class TimelineV1DelegationTokenSecretManagerService extends TimelineDelgationTokenSecretManagerService { private TimelineStateStore stateStore = null; @@ -99,8 +97,6 @@ protected TimelineStateStore createStateStore( /** * Delegation token secret manager for ATSv1 and ATSv1.5. */ - @Private - @Unstable public static class TimelineV1DelegationTokenSecretManager extends AbstractDelegationTokenSecretManager { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/CollectorNodemanagerProtocol.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/CollectorNodemanagerProtocol.java index 64eea63160db1e7e430aba1feb76f99d35e7aae4..93f30184e493aa4999a6654bccc38a5f1da44df6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/CollectorNodemanagerProtocol.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/CollectorNodemanagerProtocol.java @@ -32,7 +32,6 @@ *

* */ -@Private public interface CollectorNodemanagerProtocol { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/CollectorNodemanagerProtocolPB.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/CollectorNodemanagerProtocolPB.java index 24f7c3dd53077649223009068a2f963e2bde53f7..24604cb82a1a8fcc4a46f766d11f7e8930cbf518 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/CollectorNodemanagerProtocolPB.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/CollectorNodemanagerProtocolPB.java @@ -22,8 +22,6 @@ import org.apache.hadoop.ipc.ProtocolInfo; import org.apache.hadoop.yarn.proto.CollectorNodemanagerProtocol.CollectorNodemanagerProtocolService; -@Private -@Unstable @ProtocolInfo( protocolName = "org.apache.hadoop.yarn.server.api.CollectorNodemanagerProtocolPB", diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/DistributedSchedulingAMProtocol.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/DistributedSchedulingAMProtocol.java index d1ed1fcea9557da588b7aabf7fa081a4c559bebd..98fe5244e462ac66d281386220dc2f4ece3ca2ab 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/DistributedSchedulingAMProtocol.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/DistributedSchedulingAMProtocol.java @@ -56,8 +56,6 @@ * @throws YarnException YarnException * @throws IOException IOException */ - @Public - @Unstable @Idempotent RegisterDistributedSchedulingAMResponse registerApplicationMasterForDistributedScheduling( @@ -78,8 +76,6 @@ * @throws YarnException YarnException * @throws IOException IOException */ - @Public - @Unstable @Idempotent DistributedSchedulingAllocateResponse allocateForDistributedScheduling( DistributedSchedulingAllocateRequest request) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/DistributedSchedulingAMProtocolPB.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/DistributedSchedulingAMProtocolPB.java index 674d4e44c24b313480e7a6338d004e2e199d9153..adce46e200062555ec32e18530ba6e2ab3928b15 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/DistributedSchedulingAMProtocolPB.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/DistributedSchedulingAMProtocolPB.java @@ -25,8 +25,6 @@ import org.apache.hadoop.yarn.proto.ApplicationMasterProtocol.ApplicationMasterProtocolService; import org.apache.hadoop.yarn.proto.DistributedSchedulingAMProtocol.DistributedSchedulingAMProtocolService; -@Private -@Unstable @ProtocolInfo(protocolName = "org.apache.hadoop.yarn.server.api.DistributedSchedulingAMProtocolPB", protocolVersion = 1) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/SCMUploaderProtocol.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/SCMUploaderProtocol.java index 937f648510c00ae866e2e57fff31362cd2d41944..6b05ffd5e7f16d2364809c59be7334b9582eb27a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/SCMUploaderProtocol.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/SCMUploaderProtocol.java @@ -35,8 +35,6 @@ * SharedCacheManager. *

*/ -@Private -@Unstable public interface SCMUploaderProtocol { /** *

diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/CollectorNodemanagerProtocolPBClientImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/CollectorNodemanagerProtocolPBClientImpl.java index bc50ac534c42f3064d49f83deab53aacfb6897cf..ca68b79d595011ba62e39a26d520153aeeaea8c4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/CollectorNodemanagerProtocolPBClientImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/CollectorNodemanagerProtocolPBClientImpl.java @@ -59,7 +59,6 @@ private CollectorNodemanagerProtocolPB proxy; - @Private public CollectorNodemanagerProtocolPBClientImpl(long clientVersion, InetSocketAddress addr, Configuration conf) throws IOException { RPC.setProtocolEngine(conf, CollectorNodemanagerProtocolPB.class, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/DistributedSchedulingAllocateRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/DistributedSchedulingAllocateRequest.java index ac40592a4da35890da64dc6d2dd3286eb2305c2b..95d21cfb06705e41413dcb4a9454937a929cd8fb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/DistributedSchedulingAllocateRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/DistributedSchedulingAllocateRequest.java @@ -31,24 +31,18 @@ * the Resource Manager, and to notify the Resource Manager about the allocation * of OPPORTUNISTIC containers through the Distributed Scheduler. */ -@Public -@Evolving public abstract class DistributedSchedulingAllocateRequest { /** * Get the underlying AllocateRequest object. * @return Allocate request */ - @Public - @Evolving public abstract AllocateRequest getAllocateRequest(); /** * Set the underlying AllocateRequest object. * @param allocateRequest Allocate request */ - @Public - @Evolving public abstract void setAllocateRequest(AllocateRequest allocateRequest); /** @@ -56,8 +50,6 @@ * Distributed Scheduling component on the NodeManager. * @return list of newly allocated Container */ - @Public - @Evolving public abstract List getAllocatedContainers(); /** @@ -65,7 +57,5 @@ * Distributed Scheduling component on the NodeManager. * @param containers list of newly allocated Container */ - @Public - @Evolving public abstract void setAllocatedContainers(List containers); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/DistributedSchedulingAllocateResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/DistributedSchedulingAllocateResponse.java index edc0cf89d5aa3d5e82e7d779103f568971c81c79..3ae13aae17d93f1d3ff040deca955293c4fad574 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/DistributedSchedulingAllocateResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/DistributedSchedulingAllocateResponse.java @@ -33,12 +33,8 @@ * with the nodes that can be used by the Distributed Scheduler when allocating * containers. */ -@Public -@Unstable public abstract class DistributedSchedulingAllocateResponse { - @Public - @Unstable public static DistributedSchedulingAllocateResponse newInstance( AllocateResponse allResp) { DistributedSchedulingAllocateResponse response = @@ -47,20 +43,12 @@ public static DistributedSchedulingAllocateResponse newInstance( return response; } - @Public - @Unstable public abstract void setAllocateResponse(AllocateResponse response); - @Public - @Unstable public abstract AllocateResponse getAllocateResponse(); - @Public - @Unstable public abstract void setNodesForScheduling( List nodesForScheduling); - @Public - @Unstable public abstract List getNodesForScheduling(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/LogAggregationReport.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/LogAggregationReport.java index d76f4cde50c1d93a607a9abc5ca627521777f027..c2cee8bdd3ca3f0a8d521509747f0102bc03ea71 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/LogAggregationReport.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/LogAggregationReport.java @@ -36,12 +36,8 @@ * * */ -@Public -@Unstable public abstract class LogAggregationReport { - @Public - @Unstable public static LogAggregationReport newInstance(ApplicationId appId, LogAggregationStatus status, String diagnosticMessage) { LogAggregationReport report = Records.newRecord(LogAggregationReport.class); @@ -55,24 +51,16 @@ public static LogAggregationReport newInstance(ApplicationId appId, * Get the ApplicationId of the application. * @return ApplicationId of the application */ - @Public - @Unstable public abstract ApplicationId getApplicationId(); - @Public - @Unstable public abstract void setApplicationId(ApplicationId appId); /** * Get the LogAggregationStatus. * @return LogAggregationStatus */ - @Public - @Unstable public abstract LogAggregationStatus getLogAggregationStatus(); - @Public - @Unstable public abstract void setLogAggregationStatus( LogAggregationStatus logAggregationStatus); @@ -80,11 +68,7 @@ public abstract void setLogAggregationStatus( * Get the diagnositic information of this log aggregation * @return diagnositic information of this log aggregation */ - @Public - @Unstable public abstract String getDiagnosticMessage(); - @Public - @Unstable public abstract void setDiagnosticMessage(String diagnosticMessage); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/RegisterDistributedSchedulingAMResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/RegisterDistributedSchedulingAMResponse.java index f7d8df29bd4486e1d78190f463a6a6900deb74d1..69c13cb02589f88403a6a08057c4e7d917505690 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/RegisterDistributedSchedulingAMResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/RegisterDistributedSchedulingAMResponse.java @@ -33,12 +33,8 @@ * to be used during distributed scheduling, such as the min and max resources * that can be requested by containers. */ -@Public -@Unstable public abstract class RegisterDistributedSchedulingAMResponse { - @Public - @Unstable public static RegisterDistributedSchedulingAMResponse newInstance (RegisterApplicationMasterResponse regAMResp) { RegisterDistributedSchedulingAMResponse response = @@ -47,62 +43,34 @@ return response; } - @Public - @Unstable public abstract void setRegisterResponse( RegisterApplicationMasterResponse resp); - @Public - @Unstable public abstract RegisterApplicationMasterResponse getRegisterResponse(); - @Public - @Unstable public abstract void setMinContainerResource(Resource minResource); - @Public - @Unstable public abstract Resource getMinContainerResource(); - @Public - @Unstable public abstract void setMaxContainerResource(Resource maxResource); - @Public - @Unstable public abstract Resource getMaxContainerResource(); - @Public - @Unstable public abstract void setIncrContainerResource(Resource maxResource); - @Public - @Unstable public abstract Resource getIncrContainerResource(); - @Public - @Unstable public abstract void setContainerTokenExpiryInterval(int interval); - @Public - @Unstable public abstract int getContainerTokenExpiryInterval(); - @Public - @Unstable public abstract void setContainerIdStart(long containerIdStart); - @Public - @Unstable public abstract long getContainerIdStart(); - @Public - @Unstable public abstract void setNodesForScheduling( List nodesForScheduling); - @Public - @Unstable public abstract List getNodesForScheduling(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/RemoteNode.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/RemoteNode.java index f621aa209a53e310696591b63517ea3f54c1dd19..002c077cf1a02f20d8ab31f83a80a6555691cbb6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/RemoteNode.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/RemoteNode.java @@ -27,8 +27,6 @@ * This class is used to encapsulate the {@link NodeId} as well as the HTTP * address that can be used to communicate with the Node. */ -@Private -@Unstable public abstract class RemoteNode implements Comparable { /** @@ -37,8 +35,6 @@ * @param httpAddress Http address. * @return RemoteNode instance. */ - @Private - @Unstable public static RemoteNode newInstance(NodeId nodeId, String httpAddress) { RemoteNode remoteNode = Records.newRecord(RemoteNode.class); remoteNode.setNodeId(nodeId); @@ -53,8 +49,6 @@ public static RemoteNode newInstance(NodeId nodeId, String httpAddress) { * @param rackName Rack Name. * @return RemoteNode instance. */ - @Private - @Unstable public static RemoteNode newInstance(NodeId nodeId, String httpAddress, String rackName) { RemoteNode remoteNode = Records.newRecord(RemoteNode.class); @@ -68,48 +62,36 @@ public static RemoteNode newInstance(NodeId nodeId, String httpAddress, * Get {@link NodeId}. * @return NodeId. */ - @Private - @Unstable public abstract NodeId getNodeId(); /** * Set {@link NodeId}. * @param nodeId NodeId. */ - @Private - @Unstable public abstract void setNodeId(NodeId nodeId); /** * Get HTTP address. * @return Http Address. */ - @Private - @Unstable public abstract String getHttpAddress(); /** * Set HTTP address. * @param httpAddress HTTP address. */ - @Private - @Unstable public abstract void setHttpAddress(String httpAddress); /** * Get Rack Name. * @return Rack Name. */ - @Private - @Unstable public abstract String getRackName(); /** * Set Rack Name. * @param rackName Rack Name. */ - @Private - @Unstable public abstract void setRackName(String rackName); /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/ReportNewCollectorInfoRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/ReportNewCollectorInfoRequest.java index a4c1a384c26580bb99b64a8137a90da5bd7ca671..c84f07df61439f88dcb37a507b3d954cd392ee89 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/ReportNewCollectorInfoRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/ReportNewCollectorInfoRequest.java @@ -26,7 +26,6 @@ import org.apache.hadoop.yarn.server.api.records.AppCollectorData; import org.apache.hadoop.yarn.util.Records; -@Private public abstract class ReportNewCollectorInfoRequest { public static ReportNewCollectorInfoRequest newInstance( diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/ReportNewCollectorInfoResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/ReportNewCollectorInfoResponse.java index 4157c47af3ce431d578284b2047fc88a977e459c..22eb0e523cfe098726125f76e347db0ec8db3926 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/ReportNewCollectorInfoResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/ReportNewCollectorInfoResponse.java @@ -22,7 +22,6 @@ public abstract class ReportNewCollectorInfoResponse { - @Private public static ReportNewCollectorInfoResponse newInstance() { ReportNewCollectorInfoResponse response = Records.newRecord(ReportNewCollectorInfoResponse.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderCanUploadRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderCanUploadRequest.java index bb6718a77246b379bf534cfabdbb9393dac5d6af..64af558ec80aad85a441739d6a258185d4c6a75a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderCanUploadRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderCanUploadRequest.java @@ -27,8 +27,6 @@ * requests whether it can upload a resource in the shared cache. *

*/ -@Private -@Unstable public abstract class SCMUploaderCanUploadRequest { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderCanUploadResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderCanUploadResponse.java index 5fb4626963e90cad138fdaaf75e4cb577c5e0eba..96f0229b320df13a8d1fa0e032e5b92916eae130 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderCanUploadResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderCanUploadResponse.java @@ -29,8 +29,6 @@ * cache. *

*/ -@Private -@Unstable public abstract class SCMUploaderCanUploadResponse { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderNotifyRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderNotifyRequest.java index c72453c568c99012e46e269342a26d59d1a0ce75..67e1d3308b5656a6e14bf2a5c35eaeb14bd5c3a2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderNotifyRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderNotifyRequest.java @@ -29,8 +29,6 @@ * in which case the NodeManager should remove it from the shared cache. *

*/ -@Private -@Unstable public abstract class SCMUploaderNotifyRequest { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderNotifyResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderNotifyResponse.java index 83d7913ddcfb8ce92fbe596e3289c4e5f457c1fa..8caa5ebfe719c8f458258730032c78f9f4d7f6e7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderNotifyResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/SCMUploaderNotifyResponse.java @@ -28,8 +28,6 @@ * the notification for. *

*/ -@Private -@Unstable public abstract class SCMUploaderNotifyResponse { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/LogAggregationReportPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/LogAggregationReportPBImpl.java index ac6ad2e89f8006a0397f997fb3343d723d6e8679..083c270fc98fede509228f5784cfe79481cc03c2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/LogAggregationReportPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/LogAggregationReportPBImpl.java @@ -32,8 +32,6 @@ import com.google.protobuf.TextFormat; -@Private -@Unstable public class LogAggregationReportPBImpl extends LogAggregationReport { LogAggregationReportProto proto = LogAggregationReportProto diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/ReportNewCollectorInfoResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/ReportNewCollectorInfoResponsePBImpl.java index 5f2a10aace90dcdb43b8fccc14b641560643ff8b..17478820df10f8c1464a54036beb21b5650621f7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/ReportNewCollectorInfoResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/ReportNewCollectorInfoResponsePBImpl.java @@ -24,8 +24,6 @@ import com.google.protobuf.TextFormat; -@Private -@Unstable public class ReportNewCollectorInfoResponsePBImpl extends ReportNewCollectorInfoResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/AppCollectorData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/AppCollectorData.java index 5266dca1584e764f3ed530e1656f611b0d6e2443..c1402968ace5306e7321f1a23cd1401927ffd03b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/AppCollectorData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/AppCollectorData.java @@ -25,7 +25,6 @@ import org.apache.hadoop.yarn.util.Records; -@Private @InterfaceStability.Unstable public abstract class AppCollectorData { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeHealthStatus.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeHealthStatus.java index b21b88071f5e3a3a7df5d1d1c8fcfc5b631162b6..474cbbe21d76c14fa6f524fd49b687f3c3a71d43 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeHealthStatus.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeHealthStatus.java @@ -41,11 +41,8 @@ * @see NodeReport * @see ApplicationClientProtocol#getClusterNodes(org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesRequest) */ -@Public -@Stable public abstract class NodeHealthStatus { - @Private public static NodeHealthStatus newInstance(boolean isNodeHealthy, String healthReport, long lastHealthReport) { NodeHealthStatus status = Records.newRecord(NodeHealthStatus.class); @@ -59,35 +56,23 @@ public static NodeHealthStatus newInstance(boolean isNodeHealthy, * Is the node healthy? * @return true if the node is healthy, else false */ - @Public - @Stable public abstract boolean getIsNodeHealthy(); - @Private - @Unstable public abstract void setIsNodeHealthy(boolean isNodeHealthy); /** * Get the diagnostic health report of the node. * @return diagnostic health report of the node */ - @Public - @Stable public abstract String getHealthReport(); - @Private - @Unstable public abstract void setHealthReport(String healthReport); /** * Get the last timestamp at which the health report was received. * @return last timestamp at which the health report was received */ - @Public - @Stable public abstract long getLastHealthReportTime(); - @Private - @Unstable public abstract void setLastHealthReportTime(long lastHealthReport); -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeStatus.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeStatus.java index 440cd0a2902941f902f18aef0bdb92f7374a8ce7..6b8e911a1d87fc8e4b0c31863a8d454d82865f02 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeStatus.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeStatus.java @@ -92,12 +92,8 @@ public abstract void setContainersStatuses( * Get the resource utilization of the containers. * @return resource utilization of the containers */ - @Public - @Stable public abstract ResourceUtilization getContainersUtilization(); - @Private - @Unstable public abstract void setContainersUtilization( ResourceUtilization containersUtilization); @@ -105,31 +101,19 @@ public abstract void setContainersUtilization( * Get the resource utilization of the node. * @return resource utilization of the node */ - @Public - @Stable public abstract ResourceUtilization getNodeUtilization(); - @Private - @Unstable public abstract void setNodeUtilization( ResourceUtilization nodeUtilization); - @Public - @Unstable public abstract List getIncreasedContainers(); - @Private - @Unstable public abstract void setIncreasedContainers( List increasedContainers); - @Private - @Unstable public abstract OpportunisticContainersStatus getOpportunisticContainersStatus(); - @Private - @Unstable public abstract void setOpportunisticContainersStatus( OpportunisticContainersStatus opportunisticContainersStatus); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/OpportunisticContainersStatus.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/OpportunisticContainersStatus.java index 732db2a80abcae4b4898996ec2f741f638d32748..4898d7dc45b27cd3dd5bd85bb827e292b2c513e7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/OpportunisticContainersStatus.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/OpportunisticContainersStatus.java @@ -27,8 +27,6 @@ * pertaining to the state of execution of the opportunistic containers within a * node.

*/ -@Private -@Unstable public abstract class OpportunisticContainersStatus { public static OpportunisticContainersStatus newInstance() { return Records.newRecord(OpportunisticContainersStatus.class); @@ -40,8 +38,6 @@ public static OpportunisticContainersStatus newInstance() { * * @return number of running opportunistic containers. */ - @Private - @Unstable public abstract int getRunningOpportContainers(); /** @@ -49,8 +45,6 @@ public static OpportunisticContainersStatus newInstance() { * * @param runningOpportContainers number of running opportunistic containers. */ - @Private - @Unstable public abstract void setRunningOpportContainers(int runningOpportContainers); /** @@ -59,8 +53,6 @@ public static OpportunisticContainersStatus newInstance() { * * @return memory (in bytes) used for running opportunistic containers. */ - @Private - @Unstable public abstract long getOpportMemoryUsed(); /** @@ -69,8 +61,6 @@ public static OpportunisticContainersStatus newInstance() { * @param opportMemoryUsed memory (in bytes) used for running opportunistic * containers. */ - @Private - @Unstable public abstract void setOpportMemoryUsed(long opportMemoryUsed); /** @@ -79,8 +69,6 @@ public static OpportunisticContainersStatus newInstance() { * * @return CPU cores used for running opportunistic containers. */ - @Private - @Unstable public abstract int getOpportCoresUsed(); /** @@ -89,8 +77,6 @@ public static OpportunisticContainersStatus newInstance() { * @param opportCoresUsed memory (in bytes) used for running opportunistic * containers. */ - @Private - @Unstable public abstract void setOpportCoresUsed(int opportCoresUsed); /** @@ -98,8 +84,6 @@ public static OpportunisticContainersStatus newInstance() { * * @return number of queued opportunistic containers. */ - @Private - @Unstable public abstract int getQueuedOpportContainers(); /** @@ -107,8 +91,6 @@ public static OpportunisticContainersStatus newInstance() { * * @param queuedOpportContainers number of queued opportunistic containers. */ - @Private - @Unstable public abstract void setQueuedOpportContainers(int queuedOpportContainers); /** @@ -116,8 +98,6 @@ public static OpportunisticContainersStatus newInstance() { * * @return length of the containers queue. */ - @Private - @Unstable public abstract int getWaitQueueLength(); /** @@ -125,8 +105,6 @@ public static OpportunisticContainersStatus newInstance() { * * @param waitQueueLength length of the containers queue. */ - @Private - @Unstable public abstract void setWaitQueueLength(int waitQueueLength); /** @@ -135,8 +113,6 @@ public static OpportunisticContainersStatus newInstance() { * * @return estimated queuing time. */ - @Private - @Unstable public abstract int getEstimatedQueueWaitTime(); /** @@ -145,8 +121,6 @@ public static OpportunisticContainersStatus newInstance() { * * @param queueWaitTime estimated queuing time. */ - @Private - @Unstable public abstract void setEstimatedQueueWaitTime(int queueWaitTime); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/impl/pb/AppCollectorDataPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/impl/pb/AppCollectorDataPBImpl.java index c08e9ca06064bdfffffd3665c503ef1435e2e1ff..11ca8a83eb82c5f6591d3c3700594021ae09d248 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/impl/pb/AppCollectorDataPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/impl/pb/AppCollectorDataPBImpl.java @@ -30,8 +30,6 @@ import com.google.protobuf.TextFormat; -@Private -@Unstable public class AppCollectorDataPBImpl extends AppCollectorData { private AppCollectorDataProto proto = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationProxyProviderUtil.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationProxyProviderUtil.java index 3931f2bb639fd44fada6d992d6158540fcfd4035..c905a996024fceb914ba3ce5dd6a3c4af9d1b6a0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationProxyProviderUtil.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationProxyProviderUtil.java @@ -42,8 +42,6 @@ * failover provider uses the {@code FederationStateStore} to determine the * current active ResourceManager */ -@Private -@Unstable public final class FederationProxyProviderUtil { public static final Logger LOG = @@ -67,8 +65,6 @@ private FederationProxyProviderUtil() { * @return Proxy to the RM * @throws IOException on failure */ - @Public - @Unstable public static T createRMProxy(Configuration configuration, Class protocol, SubClusterId subClusterId, UserGroupInformation user) throws IOException { @@ -90,8 +86,6 @@ private FederationProxyProviderUtil() { * @return Proxy to the RM * @throws IOException on failure */ - @Public - @Unstable public static T createRMProxy(Configuration configuration, final Class protocol, SubClusterId subClusterId, UserGroupInformation user, Token token) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java index c631208b783902503f726a653f8d9bf4bcd06f0d..363da3338080cd60879e5c8a1558d7cf4c3b3874 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java @@ -50,8 +50,6 @@ * {@code FederationStateStore} to determine the ResourceManager to connect to. * This supports both HA and regular mode which is controlled by configuration. */ -@Private -@Unstable public class FederationRMFailoverProxyProvider implements RMFailoverProxyProvider { private static final Logger LOG = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/FederationPolicyUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/FederationPolicyUtils.java index aaa2c43c6ae38f43cf294606d7904f5892c184c5..d71a09a8f86fa795c2638a4cd42637e42f1a8cbb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/FederationPolicyUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/policies/FederationPolicyUtils.java @@ -40,7 +40,6 @@ /** * Utility class for Federation policy. */ -@Private public final class FederationPolicyUtils { private static final Logger LOG = LoggerFactory.getLogger(FederationPolicyUtils.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationApplicationHomeSubClusterStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationApplicationHomeSubClusterStore.java index ace2457e368671206af76dce7b3227424d2e6d42..cb6b3d043bdcbff109dc47d70991432138e5a496 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationApplicationHomeSubClusterStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationApplicationHomeSubClusterStore.java @@ -44,8 +44,6 @@ * * */ -@Private -@Unstable public interface FederationApplicationHomeSubClusterStore { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationMembershipStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationMembershipStateStore.java index 49ec3bf31dbc2c25987c8e7874be0ea6623df8ca..ef43ae23e4708717e60218e67e05744ee3f6c11c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationMembershipStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationMembershipStateStore.java @@ -36,8 +36,6 @@ * subcluster(s) as encapsulated by {@code SubClusterInfo} for all the * subcluster(s) that are participating in federation. */ -@Private -@Unstable public interface FederationMembershipStateStore { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationPolicyStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationPolicyStore.java index b0e03a6f33f6a3534655e2a18511ecf294baa440..9e850425a368f491b75f8dae634cfee71038aa6b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationPolicyStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/FederationPolicyStore.java @@ -36,8 +36,6 @@ * basis). The value is a {@code SubClusterPolicyConfiguration}, a serialized * representation of the policy type and its parameters. */ -@Private -@Unstable public interface FederationPolicyStore { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/AddApplicationHomeSubClusterRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/AddApplicationHomeSubClusterRequest.java index 9cb05890bd8e02d3773c00fa80917b62b819f2ca..bb9d10f126a96853950e6d22fc80767ee8715aa5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/AddApplicationHomeSubClusterRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/AddApplicationHomeSubClusterRequest.java @@ -34,12 +34,8 @@ *
  • {@code SubClusterId}
  • * */ -@Private -@Unstable public abstract class AddApplicationHomeSubClusterRequest { - @Private - @Unstable public static AddApplicationHomeSubClusterRequest newInstance( ApplicationHomeSubCluster applicationHomeSubCluster) { AddApplicationHomeSubClusterRequest mapRequest = @@ -54,8 +50,6 @@ public static AddApplicationHomeSubClusterRequest newInstance( * * @return the mapping of the application to it's home sub-cluster. */ - @Public - @Unstable public abstract ApplicationHomeSubCluster getApplicationHomeSubCluster(); /** @@ -65,8 +59,6 @@ public static AddApplicationHomeSubClusterRequest newInstance( * @param applicationHomeSubCluster the mapping of the application to it's * home sub-cluster. */ - @Private - @Unstable public abstract void setApplicationHomeSubCluster( ApplicationHomeSubCluster applicationHomeSubCluster); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/AddApplicationHomeSubClusterResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/AddApplicationHomeSubClusterResponse.java index 913f8e6f71c051b038d5576ba9bb4b99c4f5ebf1..e6458c28eabb0c6886357ec23ff0f0d7e055833a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/AddApplicationHomeSubClusterResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/AddApplicationHomeSubClusterResponse.java @@ -32,12 +32,8 @@ * return the existing mapping which might be different from that in the * {@code AddApplicationHomeSubClusterRequest}. */ -@Private -@Unstable public abstract class AddApplicationHomeSubClusterResponse { - @Private - @Unstable public static AddApplicationHomeSubClusterResponse newInstance( SubClusterId homeSubCluster) { AddApplicationHomeSubClusterResponse response = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/ApplicationHomeSubCluster.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/ApplicationHomeSubCluster.java index 5e4c7ccf4ef9e469fb0a59d4eb468a7596879e4a..1e3d529eea5f3f4dab91fc2c3ae60e2a4afaae7f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/ApplicationHomeSubCluster.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/ApplicationHomeSubCluster.java @@ -36,12 +36,8 @@ * * */ -@Private -@Unstable public abstract class ApplicationHomeSubCluster { - @Private - @Unstable public static ApplicationHomeSubCluster newInstance(ApplicationId appId, SubClusterId homeSubCluster) { ApplicationHomeSubCluster appMapping = @@ -57,8 +53,6 @@ public static ApplicationHomeSubCluster newInstance(ApplicationId appId, * * @return the application identifier */ - @Public - @Unstable public abstract ApplicationId getApplicationId(); /** @@ -67,8 +61,6 @@ public static ApplicationHomeSubCluster newInstance(ApplicationId appId, * * @param applicationId the application identifier */ - @Private - @Unstable public abstract void setApplicationId(ApplicationId applicationId); /** @@ -77,8 +69,6 @@ public static ApplicationHomeSubCluster newInstance(ApplicationId appId, * * @return the home subcluster identifier */ - @Public - @Unstable public abstract SubClusterId getHomeSubCluster(); /** @@ -87,8 +77,6 @@ public static ApplicationHomeSubCluster newInstance(ApplicationId appId, * * @param homeSubCluster the home subcluster identifier */ - @Private - @Unstable public abstract void setHomeSubCluster(SubClusterId homeSubCluster); @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/DeleteApplicationHomeSubClusterRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/DeleteApplicationHomeSubClusterRequest.java index f678aeec1d83a1cb3785ad8270cd73c9076a1ea8..8abe61eef43d05b318b6af0a568310c3cdfa11ad 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/DeleteApplicationHomeSubClusterRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/DeleteApplicationHomeSubClusterRequest.java @@ -27,12 +27,8 @@ * The request to Federation state store to delete the mapping of * home subcluster of a submitted application. */ -@Private -@Unstable public abstract class DeleteApplicationHomeSubClusterRequest { - @Private - @Unstable public static DeleteApplicationHomeSubClusterRequest newInstance( ApplicationId applicationId) { DeleteApplicationHomeSubClusterRequest deleteApplicationRequest = @@ -48,8 +44,6 @@ public static DeleteApplicationHomeSubClusterRequest newInstance( * @return the identifier of the application to be removed from Federation * State Store. */ - @Public - @Unstable public abstract ApplicationId getApplicationId(); /** @@ -59,7 +53,5 @@ public static DeleteApplicationHomeSubClusterRequest newInstance( * @param applicationId the identifier of the application to be removed from * Federation State Store. */ - @Private - @Unstable public abstract void setApplicationId(ApplicationId applicationId); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/DeleteApplicationHomeSubClusterResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/DeleteApplicationHomeSubClusterResponse.java index fb1bef96dbeb0125d7c4631cdf0eae2eb22689dc..a9433bc05404831d55978e4bee4cdd3c73305515 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/DeleteApplicationHomeSubClusterResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/DeleteApplicationHomeSubClusterResponse.java @@ -28,12 +28,8 @@ * the operation was successful, if not an exception reporting reason for a * failure. */ -@Private -@Unstable public abstract class DeleteApplicationHomeSubClusterResponse { - @Private - @Unstable public static DeleteApplicationHomeSubClusterResponse newInstance() { DeleteApplicationHomeSubClusterResponse response = Records.newRecord(DeleteApplicationHomeSubClusterResponse.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationHomeSubClusterRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationHomeSubClusterRequest.java index a64d22e180254e93d8437cc43b558ae8ec383ddc..5e16011926e400e33b6e597a86aaff75c1216b44 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationHomeSubClusterRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationHomeSubClusterRequest.java @@ -27,12 +27,8 @@ * Request class to obtain the home sub-cluster for the specified * {@link ApplicationId}. */ -@Private -@Unstable public abstract class GetApplicationHomeSubClusterRequest { - @Private - @Unstable public static GetApplicationHomeSubClusterRequest newInstance( ApplicationId appId) { GetApplicationHomeSubClusterRequest appMapping = @@ -47,8 +43,6 @@ public static GetApplicationHomeSubClusterRequest newInstance( * * @return the application identifier */ - @Public - @Unstable public abstract ApplicationId getApplicationId(); /** @@ -57,8 +51,6 @@ public static GetApplicationHomeSubClusterRequest newInstance( * * @param applicationId the application identifier */ - @Private - @Unstable public abstract void setApplicationId(ApplicationId applicationId); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationHomeSubClusterResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationHomeSubClusterResponse.java index 60735b382f16a7923fec1995e1cfec7b0a19f803..8d618c0dcc4155f90b0df19342d67aabd7c7515e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationHomeSubClusterResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationHomeSubClusterResponse.java @@ -35,12 +35,8 @@ *
  • {@code SubClusterId}
  • * */ -@Private -@Unstable public abstract class GetApplicationHomeSubClusterResponse { - @Private - @Unstable public static GetApplicationHomeSubClusterResponse newInstance( ApplicationHomeSubCluster applicationHomeSubCluster) { GetApplicationHomeSubClusterResponse mapResponse = @@ -55,8 +51,6 @@ public static GetApplicationHomeSubClusterResponse newInstance( * * @return the mapping of the application to it's home sub-cluster. */ - @Public - @Unstable public abstract ApplicationHomeSubCluster getApplicationHomeSubCluster(); /** @@ -66,8 +60,6 @@ public static GetApplicationHomeSubClusterResponse newInstance( * @param applicationHomeSubCluster the mapping of the application to it's * home sub-cluster. */ - @Private - @Unstable public abstract void setApplicationHomeSubCluster( ApplicationHomeSubCluster applicationHomeSubCluster); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationsHomeSubClusterRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationsHomeSubClusterRequest.java index 60549722093db01a53abac739f91b0cfe19b4c3b..14edad0fa6d63edf0a176445222306b4e98aabe8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationsHomeSubClusterRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationsHomeSubClusterRequest.java @@ -25,12 +25,8 @@ * Request class to obtain the home sub-cluster mapping of all active * applications. */ -@Private -@Unstable public abstract class GetApplicationsHomeSubClusterRequest { - @Private - @Unstable public static GetApplicationsHomeSubClusterRequest newInstance() { GetApplicationsHomeSubClusterRequest request = Records.newRecord(GetApplicationsHomeSubClusterRequest.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationsHomeSubClusterResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationsHomeSubClusterResponse.java index ba3d2c678e9090a1b91991d3abdc21a8eca3189d..24c081fc331242cafd6c136b433f796e56e825fd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationsHomeSubClusterResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationsHomeSubClusterResponse.java @@ -37,12 +37,8 @@ *
  • {@code SubClusterId}
  • * */ -@Private -@Unstable public abstract class GetApplicationsHomeSubClusterResponse { - @Private - @Unstable public static GetApplicationsHomeSubClusterResponse newInstance( List appsHomeSubClusters) { GetApplicationsHomeSubClusterResponse mapResponse = @@ -57,8 +53,6 @@ public static GetApplicationsHomeSubClusterResponse newInstance( * * @return the mapping of all submitted application to it's home sub-cluster. */ - @Public - @Unstable public abstract List getAppsHomeSubClusters(); /** @@ -68,8 +62,6 @@ public static GetApplicationsHomeSubClusterResponse newInstance( * @param appsHomeSubClusters the mapping of all submitted application to it's * home sub-cluster. */ - @Private - @Unstable public abstract void setAppsHomeSubClusters( List appsHomeSubClusters); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterInfoRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterInfoRequest.java index 656dea948ac927a99d727de0beec482aeee32417..0ae0ddfce618576c8b735d49e3b150bab7781274 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterInfoRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterInfoRequest.java @@ -26,12 +26,8 @@ * Request class to obtain information about a sub-cluster identified by its * {@link SubClusterId}. */ -@Private -@Unstable public abstract class GetSubClusterInfoRequest { - @Private - @Unstable public static GetSubClusterInfoRequest newInstance( SubClusterId subClusterId) { GetSubClusterInfoRequest subClusterRequest = @@ -46,8 +42,6 @@ public static GetSubClusterInfoRequest newInstance( * * @return the subcluster identifier */ - @Public - @Unstable public abstract SubClusterId getSubClusterId(); /** @@ -56,7 +50,5 @@ public static GetSubClusterInfoRequest newInstance( * * @param subClusterId the subcluster identifier */ - @Public - @Unstable public abstract void setSubClusterId(SubClusterId subClusterId); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterInfoResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterInfoResponse.java index f7bc74d6f31210aefcb952c43c48b7afa8c53797..8fb5e5939fd770112c371c02bebcb6e7d167d379 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterInfoResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterInfoResponse.java @@ -25,12 +25,8 @@ /** * Response to a query with {@link SubClusterInfo} about a sub-cluster. */ -@Private -@Unstable public abstract class GetSubClusterInfoResponse { - @Private - @Unstable public static GetSubClusterInfoResponse newInstance( SubClusterInfo subClusterInfo) { GetSubClusterInfoResponse registerSubClusterRequest = @@ -45,8 +41,6 @@ public static GetSubClusterInfoResponse newInstance( * * @return the information pertaining to the sub-cluster */ - @Public - @Unstable public abstract SubClusterInfo getSubClusterInfo(); /** @@ -55,8 +49,6 @@ public static GetSubClusterInfoResponse newInstance( * * @param subClusterInfo the information pertaining to the sub-cluster */ - @Private - @Unstable public abstract void setSubClusterInfo(SubClusterInfo subClusterInfo); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPoliciesConfigurationsRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPoliciesConfigurationsRequest.java index 8cb84f3070ea3d41f16da0e728606d72d91ce922..d97cb93254405bfd515216e862e28fb95c5862a3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPoliciesConfigurationsRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPoliciesConfigurationsRequest.java @@ -26,10 +26,8 @@ * GetSubClusterPoliciesConfigurationsRequest is a request to the * {@code FederationPolicyStore} to obtain all policy configurations. */ -@Private -@Unstable public abstract class GetSubClusterPoliciesConfigurationsRequest { public static GetSubClusterPoliciesConfigurationsRequest newInstance() { return Records.newRecord(GetSubClusterPoliciesConfigurationsRequest.class); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPoliciesConfigurationsResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPoliciesConfigurationsResponse.java index 2eaeb512c10c9cfbf44179fb018730d690a5cd1a..5539caa4e4f631d410c0b7c648b60cfd943142cb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPoliciesConfigurationsResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPoliciesConfigurationsResponse.java @@ -30,12 +30,8 @@ * FederationPolicyStore} to a request to get all the policies configured in the * system via a {@link SubClusterPolicyConfiguration}. */ -@Private -@Unstable public abstract class GetSubClusterPoliciesConfigurationsResponse { - @Private - @Unstable public static GetSubClusterPoliciesConfigurationsResponse newInstance( List policyConfigurations) { GetSubClusterPoliciesConfigurationsResponse response = @@ -49,8 +45,6 @@ public static GetSubClusterPoliciesConfigurationsResponse newInstance( * * @return all the policies configured in the system */ - @Public - @Unstable public abstract List getPoliciesConfigs(); /** @@ -58,9 +52,7 @@ public static GetSubClusterPoliciesConfigurationsResponse newInstance( * * @param policyConfigurations all the policies configured in the system */ - @Private - @Unstable public abstract void setPoliciesConfigs( List policyConfigurations); -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPolicyConfigurationRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPolicyConfigurationRequest.java index c3f49e1e486d30e99fe34d7eea40afa3126a6e9a..d395e2ea382947df73f55e6c4efb4a6c251da482 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPolicyConfigurationRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPolicyConfigurationRequest.java @@ -27,12 +27,8 @@ * {@code FederationPolicyStore} to get the configuration of a policy for a * given queue. */ -@Private -@Unstable public abstract class GetSubClusterPolicyConfigurationRequest { - @Private - @Unstable public static GetSubClusterPolicyConfigurationRequest newInstance( String queueName) { GetSubClusterPolicyConfigurationRequest request = @@ -47,8 +43,6 @@ public static GetSubClusterPolicyConfigurationRequest newInstance( * * @return the name of the queue */ - @Public - @Unstable public abstract String getQueue(); /** @@ -57,7 +51,5 @@ public static GetSubClusterPolicyConfigurationRequest newInstance( * * @param queueName the name of the queue */ - @Private - @Unstable public abstract void setQueue(String queueName); -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPolicyConfigurationResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPolicyConfigurationResponse.java index 350b23930131331a1c2971b7cf20a13446b26d31..f56d2449af36df43ccca274630a9119462a86359 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPolicyConfigurationResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClusterPolicyConfigurationResponse.java @@ -28,12 +28,8 @@ * FederationPolicyStore} to a request to get the information about how a policy * should be configured via a {@link SubClusterPolicyConfiguration}. */ -@Private -@Unstable public abstract class GetSubClusterPolicyConfigurationResponse { - @Private - @Unstable public static GetSubClusterPolicyConfigurationResponse newInstance( SubClusterPolicyConfiguration policy) { GetSubClusterPolicyConfigurationResponse response = @@ -47,8 +43,6 @@ public static GetSubClusterPolicyConfigurationResponse newInstance( * * @return the policy configuration for the specified queue */ - @Public - @Unstable public abstract SubClusterPolicyConfiguration getPolicyConfiguration(); /** @@ -57,9 +51,7 @@ public static GetSubClusterPolicyConfigurationResponse newInstance( * @param policyConfiguration the policyConfiguration configuration for the * specified queue */ - @Private - @Unstable public abstract void setPolicyConfiguration( SubClusterPolicyConfiguration policyConfiguration); -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClustersInfoRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClustersInfoRequest.java index 90d2f99f5dd435dd7e01b7ec170443f6bc3f0a50..b9dbe2403f54a023d963032a24a521ead928c69b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClustersInfoRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClustersInfoRequest.java @@ -31,12 +31,8 @@ * returned; otherwise, all sub-clusters will be returned regardless of state. * By default, filterInactiveSubClusters is true. */ -@Private -@Unstable public abstract class GetSubClustersInfoRequest { - @Public - @Unstable public static GetSubClustersInfoRequest newInstance( boolean filterInactiveSubClusters) { GetSubClustersInfoRequest request = @@ -51,8 +47,6 @@ public static GetSubClustersInfoRequest newInstance( * * @return whether to filter out inactive sub-clusters */ - @Public - @Unstable public abstract boolean getFilterInactiveSubClusters(); /** @@ -62,8 +56,6 @@ public static GetSubClustersInfoRequest newInstance( * @param filterInactiveSubClusters whether to filter out inactive * sub-clusters */ - @Public - @Unstable public abstract void setFilterInactiveSubClusters( boolean filterInactiveSubClusters); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClustersInfoResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClustersInfoResponse.java index bcf75aba1aef07239e841ce6e75037048b412129..7776c30755ff7a33f33c7938ca4f0f2ae23add70 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClustersInfoResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetSubClustersInfoResponse.java @@ -29,12 +29,8 @@ * Response to a query with list of {@link SubClusterInfo} about all * sub-clusters that are currently participating in Federation. */ -@Private -@Unstable public abstract class GetSubClustersInfoResponse { - @Public - @Unstable public static GetSubClustersInfoResponse newInstance( List subClusters) { GetSubClustersInfoResponse subClusterInfos = @@ -49,8 +45,6 @@ public static GetSubClustersInfoResponse newInstance( * * @return the list of {@link SubClusterInfo} */ - @Public - @Unstable public abstract List getSubClusters(); /** @@ -59,8 +53,6 @@ public static GetSubClustersInfoResponse newInstance( * * @param subClusters the list of {@link SubClusterInfo} */ - @Private - @Unstable public abstract void setSubClusters(List subClusters); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SetSubClusterPolicyConfigurationRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SetSubClusterPolicyConfigurationRequest.java index 743ad0ebddd93d14348a9f8f37396df234d71ad0..765672f6211baa0bb4d6a14933fddc93d8196de6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SetSubClusterPolicyConfigurationRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SetSubClusterPolicyConfigurationRequest.java @@ -27,11 +27,7 @@ * {@code FederationPolicyStore} to set the policy configuration corresponding * to a queue. */ -@Private -@Unstable public abstract class SetSubClusterPolicyConfigurationRequest { - @Private - @Unstable public static SetSubClusterPolicyConfigurationRequest newInstance( SubClusterPolicyConfiguration policy) { SetSubClusterPolicyConfigurationRequest request = @@ -45,8 +41,6 @@ public static SetSubClusterPolicyConfigurationRequest newInstance( * * @return the policy for the specified queue */ - @Public - @Unstable public abstract SubClusterPolicyConfiguration getPolicyConfiguration(); /** @@ -54,8 +48,6 @@ public static SetSubClusterPolicyConfigurationRequest newInstance( * * @param policyConfiguration the policyConfiguration for the specified queue */ - @Private - @Unstable public abstract void setPolicyConfiguration( SubClusterPolicyConfiguration policyConfiguration); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SetSubClusterPolicyConfigurationResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SetSubClusterPolicyConfigurationResponse.java index 401e984983ee0c6d33c2d75a0058d1b22a12b227..9eddb1888199bee6cc2dce14f62bbd1bff8094f5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SetSubClusterPolicyConfigurationResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SetSubClusterPolicyConfigurationResponse.java @@ -27,10 +27,8 @@ * {@code FederationPolicyStore} to a request to set for a policy configuration * for a given queue. */ -@Private -@Unstable public abstract class SetSubClusterPolicyConfigurationResponse { public static SetSubClusterPolicyConfigurationResponse newInstance() { return Records.newRecord(SetSubClusterPolicyConfigurationResponse.class); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterDeregisterRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterDeregisterRequest.java index 50a50a182fbcba7c05f23548c517ad212b9612bc..065afd6e40910f2e6e4a595a7abe6bf96ef5ac06 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterDeregisterRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterDeregisterRequest.java @@ -34,12 +34,8 @@ *
  • {@link SubClusterState}
  • * */ -@Private -@Unstable public abstract class SubClusterDeregisterRequest { - @Private - @Unstable public static SubClusterDeregisterRequest newInstance( SubClusterId subClusterId, SubClusterState subClusterState) { SubClusterDeregisterRequest registerRequest = @@ -55,8 +51,6 @@ public static SubClusterDeregisterRequest newInstance( * * @return the subcluster identifier */ - @Public - @Unstable public abstract SubClusterId getSubClusterId(); /** @@ -65,8 +59,6 @@ public static SubClusterDeregisterRequest newInstance( * * @param subClusterId the subcluster identifier */ - @Private - @Unstable public abstract void setSubClusterId(SubClusterId subClusterId); /** @@ -74,8 +66,6 @@ public static SubClusterDeregisterRequest newInstance( * * @return the state of the subcluster */ - @Public - @Unstable public abstract SubClusterState getState(); /** @@ -83,7 +73,5 @@ public static SubClusterDeregisterRequest newInstance( * * @param state the state of the subCluster */ - @Private - @Unstable public abstract void setState(SubClusterState state); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterDeregisterResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterDeregisterResponse.java index 74fe9944813f2b4fc5666c8407d51c92cade95d9..b9180f80102a0c4251398ddfe1aaddee233ac730 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterDeregisterResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterDeregisterResponse.java @@ -27,12 +27,8 @@ * Currently response is empty if the operation was successful, if not an * exception reporting reason for a failure. */ -@Private -@Unstable public abstract class SubClusterDeregisterResponse { - @Private - @Unstable public static SubClusterDeregisterResponse newInstance() { SubClusterDeregisterResponse response = Records.newRecord(SubClusterDeregisterResponse.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterHeartbeatRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterHeartbeatRequest.java index 3a07c18bf2a72888d2450cc9d02994eb164327f8..0a4ce0160216ae78f37908f5bd41a2596b4ce3a3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterHeartbeatRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterHeartbeatRequest.java @@ -37,19 +37,13 @@ *
  • The current capacity and utilization of the subCluster
  • * */ -@Private -@Unstable public abstract class SubClusterHeartbeatRequest { - @Private - @Unstable public static SubClusterHeartbeatRequest newInstance( SubClusterId subClusterId, SubClusterState state, String capability) { return newInstance(subClusterId, 0, state, capability); } - @Private - @Unstable public static SubClusterHeartbeatRequest newInstance( SubClusterId subClusterId, long lastHeartBeat, SubClusterState state, String capability) { @@ -68,8 +62,6 @@ public static SubClusterHeartbeatRequest newInstance( * * @return the subcluster identifier */ - @Public - @Unstable public abstract SubClusterId getSubClusterId(); /** @@ -78,8 +70,6 @@ public static SubClusterHeartbeatRequest newInstance( * * @param subClusterId the subCluster identifier */ - @Private - @Unstable public abstract void setSubClusterId(SubClusterId subClusterId); /** @@ -87,8 +77,6 @@ public static SubClusterHeartbeatRequest newInstance( * * @return the state of the subcluster */ - @Public - @Unstable public abstract long getLastHeartBeat(); /** @@ -96,8 +84,6 @@ public static SubClusterHeartbeatRequest newInstance( * * @param time the last heartbeat time of the subcluster */ - @Private - @Unstable public abstract void setLastHeartBeat(long time); /** @@ -105,8 +91,6 @@ public static SubClusterHeartbeatRequest newInstance( * * @return the state of the subcluster */ - @Public - @Unstable public abstract SubClusterState getState(); /** @@ -114,8 +98,6 @@ public static SubClusterHeartbeatRequest newInstance( * * @param state the state of the subCluster */ - @Private - @Unstable public abstract void setState(SubClusterState state); /** @@ -124,8 +106,6 @@ public static SubClusterHeartbeatRequest newInstance( * * @return the current capacity and utilization of the subcluster */ - @Public - @Unstable public abstract String getCapability(); /** @@ -134,8 +114,6 @@ public static SubClusterHeartbeatRequest newInstance( * * @param capability the current capacity and utilization of the subcluster */ - @Private - @Unstable public abstract void setCapability(String capability); @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterHeartbeatResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterHeartbeatResponse.java index 0b7fd8cd2accc8aeb02a5c7147dfcb2cbf6baaa8..6d9d753132377a02b97a3b410136b9ba7a4c9c65 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterHeartbeatResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterHeartbeatResponse.java @@ -30,12 +30,8 @@ *

    * NOTE: This can be extended to push down policies in future */ -@Private -@Unstable public abstract class SubClusterHeartbeatResponse { - @Private - @Unstable public static SubClusterHeartbeatResponse newInstance() { SubClusterHeartbeatResponse response = Records.newRecord(SubClusterHeartbeatResponse.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterId.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterId.java index fec967d86bdd9a2356d4e0639afc102e212ecab9..60dd8a78bd81d53687a2054b71d73f5d916913ae 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterId.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterId.java @@ -31,12 +31,8 @@ * The globally unique nature of the identifier is obtained from the * FederationMembershipStateStore on initialization. */ -@Private -@Unstable public abstract class SubClusterId implements Comparable { - @Private - @Unstable public static SubClusterId newInstance(String subClusterId) { SubClusterId id = Records.newRecord(SubClusterId.class); id.setId(subClusterId); @@ -50,8 +46,6 @@ public static SubClusterId newInstance(String subClusterId) { * * @return unique identifier of the subcluster */ - @Public - @Unstable public abstract String getId(); /** @@ -61,8 +55,6 @@ public static SubClusterId newInstance(String subClusterId) { * * @param subClusterId unique identifier of the subcluster */ - @Private - @Unstable protected abstract void setId(String subClusterId); @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterInfo.java index cbf64e6126b28eec6a128e5dd9df5b1ad801687b..3ca73c16ebf8645c54c78717ae79b92ce63f626d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterInfo.java @@ -37,12 +37,8 @@ *

  • The current capacity and utilization of the subCluster
  • * */ -@Private -@Unstable public abstract class SubClusterInfo { - @Private - @Unstable public static SubClusterInfo newInstance(SubClusterId subClusterId, String amRMServiceAddress, String clientRMServiceAddress, String rmAdminServiceAddress, String rmWebServiceAddress, @@ -52,8 +48,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, capability); } - @Private - @Unstable public static SubClusterInfo newInstance(SubClusterId subClusterId, String amRMServiceAddress, String clientRMServiceAddress, String rmAdminServiceAddress, String rmWebServiceAddress, @@ -78,8 +72,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @return the subcluster identifier */ - @Public - @Unstable public abstract SubClusterId getSubClusterId(); /** @@ -88,8 +80,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @param subClusterId the subCluster identifier */ - @Private - @Unstable public abstract void setSubClusterId(SubClusterId subClusterId); /** @@ -99,8 +89,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * @return the URL of the AM-RM service endpoint of the subcluster * ResourceManager */ - @Public - @Unstable public abstract String getAMRMServiceAddress(); /** @@ -110,8 +98,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * @param amRMServiceAddress the URL of the AM-RM service endpoint of the * subcluster ResourceManager */ - @Private - @Unstable public abstract void setAMRMServiceAddress(String amRMServiceAddress); /** @@ -121,8 +107,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * @return the URL of the client-RM service endpoint of the subcluster * ResourceManager */ - @Public - @Unstable public abstract String getClientRMServiceAddress(); /** @@ -132,8 +116,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * @param clientRMServiceAddress the URL of the client-RM service endpoint of * the subCluster ResourceManager */ - @Private - @Unstable public abstract void setClientRMServiceAddress(String clientRMServiceAddress); /** @@ -141,8 +123,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @return the URL of the ResourceManager administration service */ - @Public - @Unstable public abstract String getRMAdminServiceAddress(); /** @@ -151,8 +131,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * @param rmAdminServiceAddress the URL of the ResourceManager * administration service. */ - @Private - @Unstable public abstract void setRMAdminServiceAddress(String rmAdminServiceAddress); /** @@ -161,8 +139,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * @return the URL of the ResourceManager web application * interface. */ - @Public - @Unstable public abstract String getRMWebServiceAddress(); /** @@ -171,8 +147,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * @param rmWebServiceAddress the URL of the ResourceManager web * application interface. */ - @Private - @Unstable public abstract void setRMWebServiceAddress(String rmWebServiceAddress); /** @@ -180,8 +154,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @return the state of the subcluster */ - @Public - @Unstable public abstract long getLastHeartBeat(); /** @@ -189,8 +161,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @param time the last heartbeat time of the subcluster */ - @Private - @Unstable public abstract void setLastHeartBeat(long time); /** @@ -198,8 +168,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @return the state of the subcluster */ - @Public - @Unstable public abstract SubClusterState getState(); /** @@ -207,8 +175,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @param state the state of the subCluster */ - @Private - @Unstable public abstract void setState(SubClusterState state); /** @@ -216,8 +182,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @return the timestamp representing the last start time of the subcluster */ - @Public - @Unstable public abstract long getLastStartTime(); /** @@ -226,8 +190,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * @param lastStartTime the timestamp representing the last start time of the * subcluster */ - @Private - @Unstable public abstract void setLastStartTime(long lastStartTime); /** @@ -236,8 +198,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @return the current capacity and utilization of the subcluster */ - @Public - @Unstable public abstract String getCapability(); /** @@ -246,8 +206,6 @@ public static SubClusterInfo newInstance(SubClusterId subClusterId, * * @param capability the current capacity and utilization of the subcluster */ - @Private - @Unstable public abstract void setCapability(String capability); @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterPolicyConfiguration.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterPolicyConfiguration.java index 52807d97dbd82ed1afbe599ebbc8df393a65c230..88070624146498743af78318221fc64fcdea65cf 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterPolicyConfiguration.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterPolicyConfiguration.java @@ -36,13 +36,9 @@ * flexibility to evolve the policies without impacting the protocols to/from * the federation state store. */ -@Private -@Unstable public abstract class SubClusterPolicyConfiguration { - @Private - @Unstable public static SubClusterPolicyConfiguration newInstance(String queue, String policyType, ByteBuffer policyParams) { SubClusterPolicyConfiguration policy = @@ -53,8 +49,6 @@ public static SubClusterPolicyConfiguration newInstance(String queue, return policy; } - @Private - @Unstable public static SubClusterPolicyConfiguration newInstance( SubClusterPolicyConfiguration conf) { SubClusterPolicyConfiguration policy = @@ -70,8 +64,6 @@ public static SubClusterPolicyConfiguration newInstance( * * @return the name of the queue */ - @Public - @Unstable public abstract String getQueue(); /** @@ -79,8 +71,6 @@ public static SubClusterPolicyConfiguration newInstance( * * @param queueName the name of the queue */ - @Private - @Unstable public abstract void setQueue(String queueName); /** @@ -89,8 +79,6 @@ public static SubClusterPolicyConfiguration newInstance( * * @return the type of the policy */ - @Public - @Unstable public abstract String getType(); /** @@ -99,8 +87,6 @@ public static SubClusterPolicyConfiguration newInstance( * * @param policyType the type of the policy */ - @Private - @Unstable public abstract void setType(String policyType); /** @@ -110,8 +96,6 @@ public static SubClusterPolicyConfiguration newInstance( * * @return the byte array that contains the parameters */ - @Public - @Unstable public abstract ByteBuffer getParams(); /** @@ -121,8 +105,6 @@ public static SubClusterPolicyConfiguration newInstance( * * @param policyParams byte array that describes the policy */ - @Private - @Unstable public abstract void setParams(ByteBuffer policyParams); @Override @@ -159,4 +141,4 @@ public String toString() { sb.append(getParams()); return sb.toString(); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterRegisterRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterRegisterRequest.java index 8864fe30cabe3bb57a8bff5718597699ece53c6e..5eebdd15a99a16a08f64bda90f5f25a46fa66305 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterRegisterRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterRegisterRequest.java @@ -37,12 +37,8 @@ *
  • The current capacity and utilization of the subCluster
  • * */ -@Private -@Unstable public abstract class SubClusterRegisterRequest { - @Private - @Unstable public static SubClusterRegisterRequest newInstance( SubClusterInfo subClusterInfo) { SubClusterRegisterRequest registerSubClusterRequest = @@ -57,8 +53,6 @@ public static SubClusterRegisterRequest newInstance( * * @return the information pertaining to the sub-cluster */ - @Public - @Unstable public abstract SubClusterInfo getSubClusterInfo(); /** @@ -67,8 +61,6 @@ public static SubClusterRegisterRequest newInstance( * * @param subClusterInfo the information pertaining to the sub-cluster */ - @Public - @Unstable public abstract void setSubClusterInfo(SubClusterInfo subClusterInfo); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterRegisterResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterRegisterResponse.java index 060a8573fba4500eaf850e407757327f617cffe4..baa28865c2bb5290453e82f67f55b761b1a7b4b2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterRegisterResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterRegisterResponse.java @@ -29,12 +29,8 @@ * Currently response is empty if the operation was successful, if not an * exception reporting reason for a failure. */ -@Private -@Unstable public abstract class SubClusterRegisterResponse { - @Private - @Unstable public static SubClusterRegisterResponse newInstance() { SubClusterRegisterResponse response = Records.newRecord(SubClusterRegisterResponse.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterState.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterState.java index b30bd32fd026010b05f7d48b8b699dbec49118f2..4f2242f72d5ca1397e69d14c239f2b8d3a4047ff 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterState.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/SubClusterState.java @@ -27,8 +27,6 @@ * State of a SubCluster. *

    */ -@Private -@Unstable public enum SubClusterState { /** Newly registered subcluster, before the first heartbeat. */ SC_NEW, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/UpdateApplicationHomeSubClusterRequest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/UpdateApplicationHomeSubClusterRequest.java index eaa92523c83fc5c266aa6a1819afff52359e0d59..d797159a3783d1865ce678df0b24d0490f19e179 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/UpdateApplicationHomeSubClusterRequest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/UpdateApplicationHomeSubClusterRequest.java @@ -35,12 +35,8 @@ *
  • {@code SubClusterId}
  • * */ -@Private -@Unstable public abstract class UpdateApplicationHomeSubClusterRequest { - @Private - @Unstable public static UpdateApplicationHomeSubClusterRequest newInstance( ApplicationHomeSubCluster applicationHomeSubCluster) { UpdateApplicationHomeSubClusterRequest updateApplicationRequest = @@ -56,8 +52,6 @@ public static UpdateApplicationHomeSubClusterRequest newInstance( * * @return the mapping of the application to it's home sub-cluster. */ - @Public - @Unstable public abstract ApplicationHomeSubCluster getApplicationHomeSubCluster(); /** @@ -67,8 +61,6 @@ public static UpdateApplicationHomeSubClusterRequest newInstance( * @param applicationHomeSubCluster the mapping of the application to it's * home sub-cluster. */ - @Private - @Unstable public abstract void setApplicationHomeSubCluster( ApplicationHomeSubCluster applicationHomeSubCluster); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/UpdateApplicationHomeSubClusterResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/UpdateApplicationHomeSubClusterResponse.java index 743433551d9bb4f8879a3303ce7176735047e403..243fe0f9e5fbe7424fa98b50efa92d504bc87c00 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/UpdateApplicationHomeSubClusterResponse.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/UpdateApplicationHomeSubClusterResponse.java @@ -28,12 +28,8 @@ * the operation was successful, if not an exception reporting reason for a * failure. */ -@Private -@Unstable public abstract class UpdateApplicationHomeSubClusterResponse { - @Private - @Unstable public static UpdateApplicationHomeSubClusterResponse newInstance() { UpdateApplicationHomeSubClusterResponse response = Records.newRecord(UpdateApplicationHomeSubClusterResponse.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/AddApplicationHomeSubClusterRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/AddApplicationHomeSubClusterRequestPBImpl.java index 2387cde7b51f4a13f1d9531ca52c044812aa2c87..cffb0c27625c6ad71bd3432824099f29bd6bd971 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/AddApplicationHomeSubClusterRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/AddApplicationHomeSubClusterRequestPBImpl.java @@ -31,8 +31,6 @@ * Protocol buffer based implementation of * {@link AddApplicationHomeSubClusterRequest}. */ -@Private -@Unstable public class AddApplicationHomeSubClusterRequestPBImpl extends AddApplicationHomeSubClusterRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/AddApplicationHomeSubClusterResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/AddApplicationHomeSubClusterResponsePBImpl.java index b30c41c415add2af1f51148ced49f8683c6fa292..e105da2ef616a7890d6c9ded22f245ad027e1913 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/AddApplicationHomeSubClusterResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/AddApplicationHomeSubClusterResponsePBImpl.java @@ -31,8 +31,6 @@ * Protocol buffer based implementation of * {@link AddApplicationHomeSubClusterResponse}. */ -@Private -@Unstable public class AddApplicationHomeSubClusterResponsePBImpl extends AddApplicationHomeSubClusterResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/ApplicationHomeSubClusterPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/ApplicationHomeSubClusterPBImpl.java index 7e6a564f1dd8c443983e6c4ca464d8a78d20bdfd..1846b9f24848608b40a1d8f6852504aed13e1985 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/ApplicationHomeSubClusterPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/ApplicationHomeSubClusterPBImpl.java @@ -33,8 +33,6 @@ /** * Protocol buffer based implementation of {@link ApplicationHomeSubCluster}. */ -@Private -@Unstable public class ApplicationHomeSubClusterPBImpl extends ApplicationHomeSubCluster { private ApplicationHomeSubClusterProto proto = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/DeleteApplicationHomeSubClusterRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/DeleteApplicationHomeSubClusterRequestPBImpl.java index b4ef680f64f2bc7c1ed0704b09335997b5da7a11..5ad5423f5242c7e7dc7ad622a3f498bb9788a8c9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/DeleteApplicationHomeSubClusterRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/DeleteApplicationHomeSubClusterRequestPBImpl.java @@ -32,8 +32,6 @@ * Protocol buffer based implementation of * {@link DeleteApplicationHomeSubClusterRequest}. */ -@Private -@Unstable public class DeleteApplicationHomeSubClusterRequestPBImpl extends DeleteApplicationHomeSubClusterRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/DeleteApplicationHomeSubClusterResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/DeleteApplicationHomeSubClusterResponsePBImpl.java index 8a37b3c42e46aa20bdd8095edf9dec4c60235e12..c68853cc25bfba603749da296284c546c2d021b9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/DeleteApplicationHomeSubClusterResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/DeleteApplicationHomeSubClusterResponsePBImpl.java @@ -28,8 +28,6 @@ * Protocol buffer based implementation of * {@link DeleteApplicationHomeSubClusterResponse}. */ -@Private -@Unstable public class DeleteApplicationHomeSubClusterResponsePBImpl extends DeleteApplicationHomeSubClusterResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationHomeSubClusterRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationHomeSubClusterRequestPBImpl.java index 585ba81df3a686d472a426f6a71af6f5e679988d..f860ed956bc9a1a1d4e48d8c2b8bc8f62d5eaac1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationHomeSubClusterRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationHomeSubClusterRequestPBImpl.java @@ -32,8 +32,6 @@ * Protocol buffer based implementation of * {@link GetApplicationHomeSubClusterRequest}. */ -@Private -@Unstable public class GetApplicationHomeSubClusterRequestPBImpl extends GetApplicationHomeSubClusterRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationHomeSubClusterResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationHomeSubClusterResponsePBImpl.java index 11804882fbad7276ddffc1698d00c828ee34fbe8..21b15eb6e023f9bbd5c0517d302e84d13af734af 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationHomeSubClusterResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationHomeSubClusterResponsePBImpl.java @@ -31,8 +31,6 @@ * Protocol buffer based implementation of * {@link GetApplicationHomeSubClusterResponse}. */ -@Private -@Unstable public class GetApplicationHomeSubClusterResponsePBImpl extends GetApplicationHomeSubClusterResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationsHomeSubClusterRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationsHomeSubClusterRequestPBImpl.java index 3ce8d7447ae08f88c5d40beda90e4845deb6063d..b7a893786cc4c8a017f5cdd6d0a09b95c391faf0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationsHomeSubClusterRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationsHomeSubClusterRequestPBImpl.java @@ -28,8 +28,6 @@ * Protocol buffer based implementation of * {@link GetApplicationsHomeSubClusterRequest}. */ -@Private -@Unstable public class GetApplicationsHomeSubClusterRequestPBImpl extends GetApplicationsHomeSubClusterRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationsHomeSubClusterResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationsHomeSubClusterResponsePBImpl.java index 8b72a1e0b561c8d99e207f468eb23c3517efa6db..dc8861ee9d9d71f0ec947731234057e2f41125b4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationsHomeSubClusterResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetApplicationsHomeSubClusterResponsePBImpl.java @@ -35,8 +35,6 @@ * Protocol buffer based implementation of * {@link GetApplicationsHomeSubClusterResponse}. */ -@Private -@Unstable public class GetApplicationsHomeSubClusterResponsePBImpl extends GetApplicationsHomeSubClusterResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterInfoRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterInfoRequestPBImpl.java index c61c4191b996b4152e2b2cac82eb087cc765bc03..dc9fa68d71e2a42de2c71c176661e1b324a7c22c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterInfoRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterInfoRequestPBImpl.java @@ -30,8 +30,6 @@ /** * Protocol buffer based implementation of {@link GetSubClusterInfoRequest}. */ -@Private -@Unstable public class GetSubClusterInfoRequestPBImpl extends GetSubClusterInfoRequest { private GetSubClusterInfoRequestProto proto = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterInfoResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterInfoResponsePBImpl.java index d0bcc33db87f90387401473a873dee396524f306..00ec3a7b4632f520b9e5087016f7bf25541c66bf 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterInfoResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterInfoResponsePBImpl.java @@ -30,8 +30,6 @@ /** * Protocol buffer based implementation of {@link GetSubClusterInfoResponse}. */ -@Private -@Unstable public class GetSubClusterInfoResponsePBImpl extends GetSubClusterInfoResponse { private GetSubClusterInfoResponseProto proto = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPoliciesConfigurationsRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPoliciesConfigurationsRequestPBImpl.java index 3cb66011ab6c1b89a9cdd13ab1923a259a4ab8bc..bca2c30b299546ef886fb301a0052438df7df9fd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPoliciesConfigurationsRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPoliciesConfigurationsRequestPBImpl.java @@ -28,8 +28,6 @@ * Protocol buffer based implementation of * {@link GetSubClusterPoliciesConfigurationsRequest}. */ -@Private -@Unstable public class GetSubClusterPoliciesConfigurationsRequestPBImpl extends GetSubClusterPoliciesConfigurationsRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPoliciesConfigurationsResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPoliciesConfigurationsResponsePBImpl.java index 67c3654d634641c1a146df8620c0575479cf671e..9ce0d702bec04a13e2674e9cf6c9df0fb69c0fd4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPoliciesConfigurationsResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPoliciesConfigurationsResponsePBImpl.java @@ -35,8 +35,6 @@ * Protocol buffer based implementation of * {@link GetSubClusterPoliciesConfigurationsResponse}. */ -@Private -@Unstable public class GetSubClusterPoliciesConfigurationsResponsePBImpl extends GetSubClusterPoliciesConfigurationsResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPolicyConfigurationRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPolicyConfigurationRequestPBImpl.java index 35aff172cec8821cee0b59625c03415644cf972b..432c3347cf188f09b9a45268549bfc2c7c060b85 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPolicyConfigurationRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPolicyConfigurationRequestPBImpl.java @@ -29,8 +29,6 @@ * Protocol buffer based implementation of * {@link GetSubClusterPolicyConfigurationRequest}. */ -@Private -@Unstable public class GetSubClusterPolicyConfigurationRequestPBImpl extends GetSubClusterPolicyConfigurationRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPolicyConfigurationResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPolicyConfigurationResponsePBImpl.java index 96b88ae760742a96ea7e6516ceed47634ccb2b60..c74b037b9646a05cda38c93aeb0ef9b98f885a1e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPolicyConfigurationResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClusterPolicyConfigurationResponsePBImpl.java @@ -31,8 +31,6 @@ * Protocol buffer based implementation of * {@link GetSubClusterPolicyConfigurationResponse}. */ -@Private -@Unstable public class GetSubClusterPolicyConfigurationResponsePBImpl extends GetSubClusterPolicyConfigurationResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClustersInfoRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClustersInfoRequestPBImpl.java index 2b848c0d285fa4023aebf13f89e3f6d952c09f4e..28fb5d925c24ff3c93f0ee34cfd4ef712ba169f8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClustersInfoRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClustersInfoRequestPBImpl.java @@ -28,8 +28,6 @@ /** * Protocol buffer based implementation of {@link GetSubClustersInfoRequest}. */ -@Private -@Unstable public class GetSubClustersInfoRequestPBImpl extends GetSubClustersInfoRequest { private GetSubClustersInfoRequestProto proto = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClustersInfoResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClustersInfoResponsePBImpl.java index 2efa3b7380c0db8e2c57c9f9a06668298df86846..51b1e0d84b77844015fa3233bf82ed5d0e5b8f22 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClustersInfoResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/GetSubClustersInfoResponsePBImpl.java @@ -35,8 +35,6 @@ /** * Protocol buffer based implementation of {@link GetSubClustersInfoResponse}. */ -@Private -@Unstable public class GetSubClustersInfoResponsePBImpl extends GetSubClustersInfoResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SetSubClusterPolicyConfigurationRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SetSubClusterPolicyConfigurationRequestPBImpl.java index 7b7f89dba84de612cf232d9225dd8df6b99c9fc6..2aa865559615672dead447cb1fae94ed000c8961 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SetSubClusterPolicyConfigurationRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SetSubClusterPolicyConfigurationRequestPBImpl.java @@ -31,8 +31,6 @@ * Protocol buffer based implementation of * {@link SetSubClusterPolicyConfigurationRequest}. */ -@Private -@Unstable public class SetSubClusterPolicyConfigurationRequestPBImpl extends SetSubClusterPolicyConfigurationRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SetSubClusterPolicyConfigurationResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SetSubClusterPolicyConfigurationResponsePBImpl.java index 9d792150892d9cffe2be8bdc41ed6c70a0530b3e..63ab8c6b4da558f35faed8f56d789aba147b2d39 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SetSubClusterPolicyConfigurationResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SetSubClusterPolicyConfigurationResponsePBImpl.java @@ -28,8 +28,6 @@ * Protocol buffer based implementation of * {@link SetSubClusterPolicyConfigurationResponse}. */ -@Private -@Unstable public class SetSubClusterPolicyConfigurationResponsePBImpl extends SetSubClusterPolicyConfigurationResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterDeregisterRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterDeregisterRequestPBImpl.java index d4c5451471b829c811a90d466d76ce46ba92f99c..d2ba3608d0955c813185401efc40bee1de6f630e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterDeregisterRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterDeregisterRequestPBImpl.java @@ -32,8 +32,6 @@ /** * Protocol buffer based implementation of {@link SubClusterDeregisterRequest}. */ -@Private -@Unstable public class SubClusterDeregisterRequestPBImpl extends SubClusterDeregisterRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterDeregisterResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterDeregisterResponsePBImpl.java index 9e007968e26586f663b986ebb99cc00af5d9ef14..a9a083e5d2e6ccbc486aa916dad09ce5b2a3c090 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterDeregisterResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterDeregisterResponsePBImpl.java @@ -27,8 +27,6 @@ /** * Protocol buffer based implementation of {@link SubClusterDeregisterResponse}. */ -@Private -@Unstable public class SubClusterDeregisterResponsePBImpl extends SubClusterDeregisterResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterHeartbeatRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterHeartbeatRequestPBImpl.java index ca6b154bdc472203e811c5e5c4808e59eed83f5f..ed768982dc8a798e72719b5c16ecc325cb712413 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterHeartbeatRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterHeartbeatRequestPBImpl.java @@ -32,8 +32,6 @@ /** * Protocol buffer based implementation of {@link SubClusterHeartbeatRequest}. */ -@Private -@Unstable public class SubClusterHeartbeatRequestPBImpl extends SubClusterHeartbeatRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterHeartbeatResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterHeartbeatResponsePBImpl.java index 2020c1ad749a40f83771a6cf54a27e13ed0cc862..59cd2af7ba4c67ab52796be992810f4936f24526 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterHeartbeatResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterHeartbeatResponsePBImpl.java @@ -27,8 +27,6 @@ /** * Protocol buffer based implementation of {@link SubClusterHeartbeatResponse}. */ -@Private -@Unstable public class SubClusterHeartbeatResponsePBImpl extends SubClusterHeartbeatResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterIdPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterIdPBImpl.java index 1bf96bfc503a52603a7b44df8375a785a52b4847..82d55df2555e9cab8a650fedf8faf322519af7bb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterIdPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterIdPBImpl.java @@ -26,8 +26,6 @@ /** * Protocol buffer based implementation of {@link SubClusterId}. */ -@Private -@Unstable public class SubClusterIdPBImpl extends SubClusterId { private SubClusterIdProto proto = SubClusterIdProto.getDefaultInstance(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterInfoPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterInfoPBImpl.java index cfdd0385cdff8223bdb9d4b51dbe813606d1d6a6..9f569ccf8b62d056500b8dfd59420d41344f642e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterInfoPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterInfoPBImpl.java @@ -33,8 +33,6 @@ /** * Protocol buffer based implementation of {@link SubClusterInfo}. */ -@Private -@Unstable public class SubClusterInfoPBImpl extends SubClusterInfo { private SubClusterInfoProto proto = SubClusterInfoProto.getDefaultInstance(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterPolicyConfigurationPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterPolicyConfigurationPBImpl.java index 305a8d322324a95c2624b9bb6002108985be53c8..ac4fab6ff44eaaa091bedbe163c0930675a4c98a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterPolicyConfigurationPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterPolicyConfigurationPBImpl.java @@ -32,8 +32,6 @@ * Protobuf based implementation of {@link SubClusterPolicyConfiguration}. * */ -@Private -@Unstable public class SubClusterPolicyConfigurationPBImpl extends SubClusterPolicyConfiguration { @@ -135,4 +133,4 @@ public void setParams(ByteBuffer policyParams) { builder.setParams(ProtoUtils.convertToProtoFormat(policyParams)); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterRegisterRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterRegisterRequestPBImpl.java index 3429cc91712277abd25ad03334da1b05e4aebc4a..f75f1d407c32f80bc83331d60fdf239f80802931 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterRegisterRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterRegisterRequestPBImpl.java @@ -30,8 +30,6 @@ /** * Protocol buffer based implementation of {@link SubClusterRegisterRequest}. */ -@Private -@Unstable public class SubClusterRegisterRequestPBImpl extends SubClusterRegisterRequest { private SubClusterRegisterRequestProto proto = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterRegisterResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterRegisterResponsePBImpl.java index 68930e33b104cb0f6b241d8ca7ff00a192d12035..066dfaabd4f7579e195b9670edbc2ac8696e4767 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterRegisterResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/SubClusterRegisterResponsePBImpl.java @@ -27,8 +27,6 @@ /** * Protocol buffer based implementation of {@link SubClusterRegisterResponse}. */ -@Private -@Unstable public class SubClusterRegisterResponsePBImpl extends SubClusterRegisterResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/UpdateApplicationHomeSubClusterRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/UpdateApplicationHomeSubClusterRequestPBImpl.java index e42eb00aa3a820d1e8ac1e1d7f5b850a00bddb19..569e4bd92731e832b5fd2db44837e3a8ff8bc688 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/UpdateApplicationHomeSubClusterRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/UpdateApplicationHomeSubClusterRequestPBImpl.java @@ -31,8 +31,6 @@ * Protocol buffer based implementation of * {@link UpdateApplicationHomeSubClusterRequest} . */ -@Private -@Unstable public class UpdateApplicationHomeSubClusterRequestPBImpl extends UpdateApplicationHomeSubClusterRequest { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/UpdateApplicationHomeSubClusterResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/UpdateApplicationHomeSubClusterResponsePBImpl.java index ec31f0b496b9fad9ca430726f344192816454d68..fda16cf8e79a8435e122a38a45ec652fdae85c87 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/UpdateApplicationHomeSubClusterResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/impl/pb/UpdateApplicationHomeSubClusterResponsePBImpl.java @@ -28,8 +28,6 @@ * Protocol buffer based implementation of * {@link UpdateApplicationHomeSubClusterResponse}. */ -@Private -@Unstable public class UpdateApplicationHomeSubClusterResponsePBImpl extends UpdateApplicationHomeSubClusterResponse { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/AppAttemptMetricsConstants.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/AppAttemptMetricsConstants.java index 2f61f43a2554c9a4bf280624da3f7ecb2a6d6d77..24e0cd2dfc5e38c03b52bdcd89c79234209fce12 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/AppAttemptMetricsConstants.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/AppAttemptMetricsConstants.java @@ -21,8 +21,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; -@Private -@Unstable public class AppAttemptMetricsConstants { public static final String ENTITY_TYPE = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/ApplicationMetricsConstants.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/ApplicationMetricsConstants.java index 4cec409bb4109d05158c0b76b08d183014bbc68b..2f1bd446d42fd84a1bfa76dd9387260ea0ac0e5d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/ApplicationMetricsConstants.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/ApplicationMetricsConstants.java @@ -21,8 +21,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; -@Private -@Unstable public class ApplicationMetricsConstants { public static final String ENTITY_TYPE = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/ContainerMetricsConstants.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/ContainerMetricsConstants.java index 9cf2b0abac56c7f55ee1bd5d6b0dc12a8902ef70..21d1b268c8a4147c37c3e549ea015a6cc09740f9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/ContainerMetricsConstants.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/ContainerMetricsConstants.java @@ -21,8 +21,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; -@Private -@Unstable public class ContainerMetricsConstants { public static final String ENTITY_TYPE = "YARN_CONTAINER"; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/records/Version.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/records/Version.java index 66042ea8ad26c414812d8a322d71c38e65e1beeb..10138451ecdbe5f07bd44be68cbf925ce38bd0a0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/records/Version.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/records/Version.java @@ -30,7 +30,6 @@ * minor version update indicates compatible changes. */ @LimitedPrivate({"YARN", "MapReduce"}) -@Unstable public abstract class Version { public static Version newInstance(int majorVersion, int minorVersion) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseContainerTokenSecretManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseContainerTokenSecretManager.java index 420c899f686703d9ce82f8a4e37fb809aec1d667..23dffff30ea60475de6d9996acc154776478f3aa 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseContainerTokenSecretManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseContainerTokenSecretManager.java @@ -74,7 +74,6 @@ protected MasterKeyData createNewMasterKey() { } } - @Private public MasterKey getCurrentKey() { this.readLock.lock(); try { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseNMTokenSecretManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseNMTokenSecretManager.java index 3cbd1dc36dcce27bf040ea0337bbc165b6126102..632d5c7495c01df1caa05557760776b5e36abae0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseNMTokenSecretManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/BaseNMTokenSecretManager.java @@ -59,7 +59,6 @@ protected MasterKeyData createNewMasterKey() { } } - @Private public MasterKey getCurrentKey() { this.readLock.lock(); try { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/http/RMAuthenticationFilter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/http/RMAuthenticationFilter.java index c3497a95839cdd8989337d271ce3398d20b5a237..1d3c18c6d94d347caaf56337db6c2774ea3fde9b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/http/RMAuthenticationFilter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/http/RMAuthenticationFilter.java @@ -34,8 +34,6 @@ import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticationFilter; import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticator; -@Private -@Unstable public class RMAuthenticationFilter extends DelegationTokenAuthenticationFilter { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/http/RMAuthenticationFilterInitializer.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/http/RMAuthenticationFilterInitializer.java index 9fc13348c132ab194cb51e7c3106cda5ac6bd599..3e28fcfbd77be658f227aec972814070f1904c9d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/http/RMAuthenticationFilterInitializer.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/security/http/RMAuthenticationFilterInitializer.java @@ -39,7 +39,6 @@ import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticationHandler; import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier; -@Unstable public class RMAuthenticationFilterInitializer extends FilterInitializer { String configPrefix; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/sharedcache/SharedCacheUtil.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/sharedcache/SharedCacheUtil.java index 0e294324d584f4fe9560e17eefc41b7975191ad9..9ccdc3fa7c6f6459d753900af0cb94360e2a7ee0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/sharedcache/SharedCacheUtil.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/sharedcache/SharedCacheUtil.java @@ -30,14 +30,11 @@ * A utility class that contains helper methods for dealing with the internal * shared cache structure. */ -@Private -@Unstable public class SharedCacheUtil { private static final Logger LOG = LoggerFactory.getLogger(SharedCacheUtil.class); - @Private public static int getCacheDepth(Configuration conf) { int cacheDepth = conf.getInt(YarnConfiguration.SHARED_CACHE_NESTED_LEVEL, @@ -53,7 +50,6 @@ public static int getCacheDepth(Configuration conf) { return cacheDepth; } - @Private public static String getCacheEntryPath(int cacheDepth, String cacheRoot, String checksum) { @@ -79,7 +75,6 @@ public static String getCacheEntryPath(int cacheDepth, String cacheRoot, return sb.toString(); } - @Private public static String getCacheEntryGlobPattern(int depth) { StringBuilder pattern = new StringBuilder(); for (int i = 0; i < depth; i++) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilter.java index f6d1863cfc3517b4a1f44e60ce835f97c276b5cf..d20c77cf938f0eda7578706c4006d210a20e8536 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilter.java @@ -31,8 +31,6 @@ * Timeline authentication filter provides delegation token support for ATSv1 * and ATSv2. */ -@Private -@Unstable public class TimelineAuthenticationFilter extends DelegationTokenAuthenticationFilter { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java index 08aee77fe6d6305cf8246af18a1289f058ef7612..d8216cb02ffcb45f8a5a165c9a974dd8e6791777 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java @@ -58,8 +58,6 @@ * A service that manages a pool of UAM managers in * {@link UnmanagedApplicationManager}. */ -@Public -@Unstable public class UnmanagedAMPoolManager extends AbstractService { public static final Logger LOG = LoggerFactory.getLogger(UnmanagedAMPoolManager.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedApplicationManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedApplicationManager.java index 6531a75c95a1aaa3970587c8a2f82ef080241f81..8f97987c88f90ab8ea9f3c4fefb764110154ab41 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedApplicationManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedApplicationManager.java @@ -77,8 +77,6 @@ * is not launched and managed by the RM. Allocate calls are handled * asynchronously using {@link AsyncCallback}. */ -@Public -@Unstable public class UnmanagedApplicationManager { private static final Logger LOG = LoggerFactory.getLogger(UnmanagedApplicationManager.class); @@ -604,4 +602,4 @@ public void uncaughtException(Thread t, Throwable e) { t.getName(), attemptId, e); } } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java index 7993bd8a5ece4bdd8c3b961ee8508e0564d29de4..c63984e6d6d10aa3cff3a0f9b778c400366ec587 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java @@ -49,7 +49,6 @@ /** * Utility class for AMRMClient. */ -@Private public final class AMRMClientUtils { private static final Logger LOG = LoggerFactory.getLogger(AMRMClientUtils.class); @@ -154,8 +153,6 @@ public static FinishApplicationMasterResponse finishAMWithReRegister( * @return Proxy to the RM * @throws IOException on failure */ - @Public - @Unstable public static T createRMProxy(final Configuration configuration, final Class protocol, UserGroupInformation user, final Token token) throws IOException { @@ -186,4 +183,4 @@ private static void setAuthModeInConf(Configuration conf) { conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, SaslRpcServer.AuthMethod.TOKEN.toString()); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java index fec26815817bada1ce2a4002db73758d4e8c852d..fb45adfc65022ee33bbc24cf1cb93079709e8603 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java @@ -77,7 +77,6 @@ * Builder utilities to construct various objects. * */ -@Private public class BuilderUtils { private static final RecordFactory recordFactory = RecordFactoryProvider diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/LeveldbIterator.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/LeveldbIterator.java index f33cb5f1d896507dcba8e54cd8e4e677a5e948b1..2c0c123834ff5e2a9ccbc739e6740442c3889221 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/LeveldbIterator.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/LeveldbIterator.java @@ -34,8 +34,6 @@ * A wrapper for a DBIterator to translate the raw RuntimeExceptions that * can be thrown into DBExceptions. */ -@Public -@Evolving public class LeveldbIterator implements Iterator>, Closeable { private DBIterator iter; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/YarnServerSecurityUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/YarnServerSecurityUtils.java index e61798d2e38e09d19f0edcbccc4b602755c68ff4..77cfd7932094b7f55447dc1ce87c05c344730e38 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/YarnServerSecurityUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/YarnServerSecurityUtils.java @@ -43,7 +43,6 @@ * Utility class that contains commonly used server methods. * */ -@Private public final class YarnServerSecurityUtils { private static final Logger LOG = LoggerFactory.getLogger(YarnServerSecurityUtils.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptInfo.java index cd30bf0358d09dd3f2289fb23ee1bf981de6b087..673a956f2bfc3caf358fdcfd2e769ebbd0e5ca01 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptInfo.java @@ -28,8 +28,6 @@ import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport; import org.apache.hadoop.yarn.api.records.YarnApplicationAttemptState; -@Public -@Evolving @XmlRootElement(name = "appAttempt") @XmlAccessorType(XmlAccessType.FIELD) public class AppAttemptInfo { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptsInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptsInfo.java index ae33b714d6a42b2f80ba33c4ceb083bc288dbddb..22f961f993012972f1054f63bf6518d1fd9ce25f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptsInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptsInfo.java @@ -27,8 +27,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; -@Public -@Evolving @XmlRootElement(name = "appAttempts") @XmlAccessorType(XmlAccessType.FIELD) public class AppAttemptsInfo { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java index ac2f8da6aa2ffd8d5ed6158b5914c7ba252215cd..87df103d8f8307be837a81b9fcaf42935765f6e0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java @@ -32,8 +32,6 @@ import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.util.Times; -@Public -@Evolving @XmlRootElement(name = "app") @XmlAccessorType(XmlAccessType.FIELD) public class AppInfo { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppsInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppsInfo.java index 8d00642feb1b24f6d71b3b265f8f2c11c2411120..f5e79a61622f34ef0073b8c99778fd2c9012ebf8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppsInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppsInfo.java @@ -26,8 +26,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -@Public -@Evolving @XmlRootElement(name = "apps") @XmlAccessorType(XmlAccessType.FIELD) public class AppsInfo { @@ -46,4 +44,4 @@ public void add(AppInfo appinfo) { return app; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/ContainerInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/ContainerInfo.java index 1a5ee85cf895255a23f7042d9397301800c87786..cce1b39b7acc70ed4a2e9c4d2383c6fa535ae32e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/ContainerInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/ContainerInfo.java @@ -29,8 +29,6 @@ import org.apache.hadoop.yarn.api.records.ContainerState; import org.apache.hadoop.yarn.util.Times; -@Public -@Evolving @XmlRootElement(name = "container") @XmlAccessorType(XmlAccessType.FIELD) public class ContainerInfo { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/ContainersInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/ContainersInfo.java index 545f84e3232cb29e903cf58eeb0cdb580a9ff5cd..148a0d0231fa4e30a711642fd08ce0dbee442590 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/ContainersInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/ContainersInfo.java @@ -26,8 +26,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; -@Public -@Evolving @XmlRootElement(name = "containers") @XmlAccessorType(XmlAccessType.FIELD) public class ContainersInfo { @@ -46,4 +44,4 @@ public void add(ContainerInfo containerInfo) { return container; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java index 5d78f9d4c43fb43e2bdc850364a8e743dd865a15..3a98be4d0daf47e16b6703a95637dfc71bb45901 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java @@ -197,7 +197,6 @@ public void startLocalizer(LocalizerStartContext ctx) * @throws IOException if {@code user} or {@code locId} is {@code null} or if * the container localizer has an initialization failure */ - @Private @VisibleForTesting protected ContainerLocalizer createContainerLocalizer(String user, String appId, String locId, List localDirs, @@ -740,7 +739,6 @@ protected Path getWorkingDir(List localDirs, String user, * Picks a directory based on the input random number and * available size at each dir. */ - @Private @VisibleForTesting int pickDirectory(long randomPosition, final long[] availableOnDisk) { int dir = 0; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java index ae81dc11187cc2322a04b7e34eb7a68c64c2151c..df677bce68078ab2eea8eb70a492a0bc4dc511c0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java @@ -204,8 +204,7 @@ public void serviceStop() throws Exception { * Used only by unit tests * @return true if service has completely stopped */ - @Private public boolean isTerminated() { return getServiceState() == STATE.STOPPED && sched.isTerminated(); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java index c0630b246f6304d82aa717a8ce2194e6cee7b7f3..c0f609fcd801c4502665d45407fe155213bac5cd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java @@ -60,7 +60,6 @@ * Good local directories, use internally, * initial value is the same as NM_LOCAL_DIRS. */ - @Private static final String NM_GOOD_LOCAL_DIRS = YarnConfiguration.NM_PREFIX + "good-local-dirs"; @@ -68,7 +67,6 @@ * Good log directories, use internally, * initial value is the same as NM_LOG_DIRS. */ - @Private static final String NM_GOOD_LOG_DIRS = YarnConfiguration.NM_PREFIX + "good-log-dirs"; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java index 7a6106e195d14f011039f87919493ded95e8a265..0e31ce960bec873095ceb94d1c7420da0b5062cf 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java @@ -925,7 +925,6 @@ public static void main(String[] args) throws IOException { } @VisibleForTesting - @Private public NodeStatusUpdater getNodeStatusUpdater() { return nodeStatusUpdater; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java index 98e2e87cc9930ce3c043af5cd1daef743bc5ea56..a200fdbba79b30e52c63e56c34d9b50edf2a924c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java @@ -333,7 +333,6 @@ protected void stopRMProxy() { } } - @Private protected boolean isTokenKeepAliveEnabled(Configuration conf) { return conf.getBoolean(YarnConfiguration.LOG_AGGREGATION_ENABLED, YarnConfiguration.DEFAULT_LOG_AGGREGATION_ENABLED) @@ -657,7 +656,6 @@ public void addCompletedContainer(ContainerId containerId) { } @VisibleForTesting - @Private public void removeOrTrackCompletedContainersFromContext( List containerIds) throws IOException { Set removedContainers = new HashSet(); @@ -727,7 +725,6 @@ public void clearFinishedContainersFromCache() { } } - @Private @VisibleForTesting public void removeVeryOldStoppedContainersFromCache() { synchronized (recentlyStoppedContainers) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContextImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContextImpl.java index 9938b370b24edb7accd1e4a22090881793002045..1afa20146ef811968b8243dc64c15a289d2f38cd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContextImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContextImpl.java @@ -111,7 +111,6 @@ public synchronized void setLocalAMRMToken( this.localTokenKeyId = null; } - @Private public synchronized int getLocalAMRMTokenKeyId() { Integer keyId = this.localTokenKeyId; if (keyId == null) { @@ -134,4 +133,4 @@ public synchronized int getLocalAMRMTokenKeyId() { public Context getNMCotext() { return nmContext; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java index d63b2cf589b5dc7148380a799534a815c7822966..26e86cb2f186b0ebba87f599572e64aa1848ced3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java @@ -683,12 +683,10 @@ private RequestInterceptorChainWrapper getInterceptorChain( return null; } - @Private public InetSocketAddress getBindAddress() { return this.listenerEndpoint; } - @Private public AMRMProxyTokenSecretManager getSecretManager() { return this.secretManager; } @@ -729,7 +727,6 @@ public void handle(ApplicationEvent event) { * ApplicationAttemptId instances. * */ - @Private public static class RequestInterceptorChainWrapper { private RequestInterceptor rootInterceptor; private ApplicationAttemptId applicationAttemptId; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyTokenSecretManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyTokenSecretManager.java index f36d4dabf27dc1310f200367bf442380db92e475..798ff784f7dd63bccaa25821421877ac75b1060e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyTokenSecretManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyTokenSecretManager.java @@ -145,7 +145,6 @@ public void run() { } } - @Private @VisibleForTesting public void rollMasterKey() { this.writeLock.lock(); @@ -174,7 +173,6 @@ public void run() { } } - @Private @VisibleForTesting public void activateNextMasterKey() { this.writeLock.lock(); @@ -197,7 +195,6 @@ public void activateNextMasterKey() { } } - @Private @VisibleForTesting public MasterKeyData createNewMasterKey() { this.writeLock.lock(); @@ -282,7 +279,6 @@ public AMRMTokenIdentifier createIdentifier() { return new AMRMTokenIdentifier(); } - @Private @VisibleForTesting public MasterKeyData getCurrentMasterKeyData() { this.readLock.lock(); @@ -293,7 +289,6 @@ public MasterKeyData getCurrentMasterKeyData() { } } - @Private @VisibleForTesting public MasterKeyData getNextMasterKeyData() { this.readLock.lock(); @@ -305,7 +300,6 @@ public MasterKeyData getNextMasterKeyData() { } @Override - @Private protected byte[] createPassword(AMRMTokenIdentifier identifier) { this.readLock.lock(); try { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/ResourceLocalizationSpec.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/ResourceLocalizationSpec.java index 63c3fd3fb8b6bbcb7d26d66dbe88ca163d938c4e..68a24101b2d9deb5a47b5b40bfa8e2dcda2abf93 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/ResourceLocalizationSpec.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/ResourceLocalizationSpec.java @@ -23,7 +23,6 @@ import com.google.common.annotations.VisibleForTesting; -@Private @VisibleForTesting public interface ResourceLocalizationSpec { @@ -34,4 +33,4 @@ public void setDestinationDirectory(URL destinationDirectory); public URL getDestinationDirectory(); -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java index 38eb636f746445c732a290bfd6df79d37a72ebfd..e49cb111a641c2970581a127c51cfef3d80feff6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java @@ -787,7 +787,6 @@ protected UserGroupInformation getRemoteUgi() // Obtain the needed ContainerTokenIdentifier from the remote-UGI. RPC layer // currently sets only the required id, but iterate through anyways just to // be sure. - @Private @VisibleForTesting protected NMTokenIdentifier selectNMTokenIdentifier( UserGroupInformation remoteUgi) { @@ -820,7 +819,6 @@ protected void authorizeUser(UserGroupInformation remoteUgi, * of the container whose resource is to be started or increased * @throws YarnException */ - @Private @VisibleForTesting protected void authorizeStartAndResourceIncreaseRequest( NMTokenIdentifier nmTokenIdentifier, @@ -1305,7 +1303,6 @@ private void updateContainerInternal(ContainerId containerId, } } - @Private @VisibleForTesting protected void updateNMTokenIdentifier(NMTokenIdentifier nmTokenIdentifier) throws InvalidToken { @@ -1419,7 +1416,6 @@ protected ContainerStatus getContainerStatusInternal(ContainerId containerID, return containerStatus; } - @Private @VisibleForTesting protected void authorizeGetAndStopContainerRequest(ContainerId containerId, Container container, boolean stopRequest, NMTokenIdentifier identifier) @@ -1634,12 +1630,10 @@ public Context getContext() { return this.auxiliaryServices.getMetaData(); } - @Private public AMRMProxyService getAMRMProxyService() { return this.amrmProxyService; } - @Private protected void setAMRMProxyService(AMRMProxyService amrmProxyService) { this.amrmProxyService = amrmProxyService; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java index 2378c454e701feb1bf0ff82c61969aa865190877..500ec07dd50900d187ae37535c6219de3c800f62 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java @@ -141,7 +141,6 @@ public ContainerLocalizer(FileContext lfs, String user, String appId, this.pendingResources = new HashMap>(); } - @Private @VisibleForTesting public LocalizationProtocol getProxy(final InetSocketAddress nmAddr) { YarnRPC rpc = YarnRPC.create(conf); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java index c37f2e3d917bf8b996b50c97a1b04e168f9e4dd2..ca1e28ac9f35ded08c2fc855d203745b8be69b68 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java @@ -694,19 +694,16 @@ private String getAppFileCachePath(String user, String appId) { } @VisibleForTesting - @Private public PublicLocalizer getPublicLocalizer() { return localizerTracker.publicLocalizer; } @VisibleForTesting - @Private public LocalizerRunner getLocalizerRunner(String locId) { return localizerTracker.privLocalizers.get(locId); } @VisibleForTesting - @Private public Map getPrivateLocalizers() { return localizerTracker.privLocalizers; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadEvent.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadEvent.java index 2be080e846d2cbf15fbf2ed135f6ba05ecc64f9b..09c0ae2092ee1d76bb5253c5101aa54285d21c65 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadEvent.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadEvent.java @@ -27,8 +27,6 @@ import org.apache.hadoop.yarn.event.AbstractEvent; import org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.LocalResourceRequest; -@Private -@Unstable public class SharedCacheUploadEvent extends AbstractEvent { private final Map resources; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadEventType.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadEventType.java index 5ba7e1b6b183b5856b58b807d6958e06917037b3..31ecbd881313bf7296954affd27798d0f7021484 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadEventType.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadEventType.java @@ -21,8 +21,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; -@Private -@Unstable public enum SharedCacheUploadEventType { UPLOAD } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadService.java index 9afbf3fde8c9bb92f783d0c5d2a6a7e484ffeccd..da2597e1255227d1b6966ef05101d9b99f498943 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/sharedcache/SharedCacheUploadService.java @@ -41,8 +41,6 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; -@Private -@Unstable /** * Service that uploads localized files to the shared cache. The upload is * considered not critical, and is done on a best-effort basis. Failure to diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AMOnlyLogAggregationPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AMOnlyLogAggregationPolicy.java index 1c740ee2001f570af4708d87b018c0ffcd83df08..12600838386e6b7d2e523ad3e159438ac1958516 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AMOnlyLogAggregationPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AMOnlyLogAggregationPolicy.java @@ -22,10 +22,9 @@ import org.apache.hadoop.yarn.server.api.ContainerLogContext; import org.apache.hadoop.yarn.server.api.ContainerType; -@Private public class AMOnlyLogAggregationPolicy extends AbstractContainerLogAggregationPolicy { public boolean shouldDoLogAggregation(ContainerLogContext logContext) { return logContext.getContainerType() == ContainerType.APPLICATION_MASTER; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AMOrFailedContainerLogAggregationPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AMOrFailedContainerLogAggregationPolicy.java index faee00404e5faa13c1062ad0351c393d3be53214..f10432141e034875b7c331df6ad2723b75bc0bd0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AMOrFailedContainerLogAggregationPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AMOrFailedContainerLogAggregationPolicy.java @@ -23,7 +23,6 @@ import org.apache.hadoop.yarn.server.api.ContainerType; import org.apache.hadoop.yarn.server.nodemanager.ContainerExecutor.ExitCode; -@Private public class AMOrFailedContainerLogAggregationPolicy extends AbstractContainerLogAggregationPolicy { public boolean shouldDoLogAggregation(ContainerLogContext logContext) { @@ -32,4 +31,4 @@ public boolean shouldDoLogAggregation(ContainerLogContext logContext) { (exitCode != 0 && exitCode != ExitCode.FORCE_KILLED.getExitCode() && exitCode != ExitCode.TERMINATED.getExitCode()); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AbstractContainerLogAggregationPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AbstractContainerLogAggregationPolicy.java index 8d9dc0326f362cffb47ee9cf6ce0fdb668be0d53..be1e33f07c236e000b92e9570a17178ac561c578 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AbstractContainerLogAggregationPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AbstractContainerLogAggregationPolicy.java @@ -23,9 +23,8 @@ // The class provides no-op implementation for parseParameters. Polices // that don't need parameters can derive from this class. -@Private public abstract class AbstractContainerLogAggregationPolicy implements ContainerLogAggregationPolicy { public void parseParameters(String parameters) { } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AllContainerLogAggregationPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AllContainerLogAggregationPolicy.java index 3e7cd5ab677fdcb53d00feb50b5243892f7e7f65..87b939ad72c85cc00eab4bca8ee882b2c4f415d3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AllContainerLogAggregationPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AllContainerLogAggregationPolicy.java @@ -21,10 +21,9 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.yarn.server.api.ContainerLogContext; -@Private public class AllContainerLogAggregationPolicy extends AbstractContainerLogAggregationPolicy { public boolean shouldDoLogAggregation(ContainerLogContext logContext) { return true; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java index 4ac150ac065ab303c35084000b6f0e4bb098cfad..5228ec8a05922b702b2469e6d0f2dd52e93be0ab 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java @@ -529,7 +529,6 @@ public void disableLogAggregation() { this.logAggregationDisabled = true; } - @Private @VisibleForTesting // This is only used for testing. // This will wake the log aggregation thread that is waiting for @@ -611,7 +610,6 @@ public UserGroupInformation getUgi() { return this.userUgi; } - @Private @VisibleForTesting public int getLogAggregationTimes() { return this.logAggregationTimes; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/FailedContainerLogAggregationPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/FailedContainerLogAggregationPolicy.java index 800315ece088bba2900957cf2b95f57c6848e973..dbbb2be81f26b355a8745ab656415e05a79012ae 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/FailedContainerLogAggregationPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/FailedContainerLogAggregationPolicy.java @@ -22,7 +22,6 @@ import org.apache.hadoop.yarn.server.api.ContainerLogContext; import org.apache.hadoop.yarn.server.nodemanager.ContainerExecutor.ExitCode; -@Private public class FailedContainerLogAggregationPolicy extends AbstractContainerLogAggregationPolicy { public boolean shouldDoLogAggregation(ContainerLogContext logContext) { @@ -30,4 +29,4 @@ public boolean shouldDoLogAggregation(ContainerLogContext logContext) { return exitCode != 0 && exitCode != ExitCode.FORCE_KILLED.getExitCode() && exitCode != ExitCode.TERMINATED.getExitCode(); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/FailedOrKilledContainerLogAggregationPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/FailedOrKilledContainerLogAggregationPolicy.java index 02a48ab27f179f8db3a177101fb9f80cae85bc4d..03497e818b1e72148687d99545e6bf84d75e5b12 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/FailedOrKilledContainerLogAggregationPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/FailedOrKilledContainerLogAggregationPolicy.java @@ -21,10 +21,9 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.yarn.server.api.ContainerLogContext; -@Private public class FailedOrKilledContainerLogAggregationPolicy extends AbstractContainerLogAggregationPolicy { public boolean shouldDoLogAggregation(ContainerLogContext logContext) { return logContext.getExitCode() != 0; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/LogAggregationService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/LogAggregationService.java index 4938939ae2b816c835aeeba1ba69562727e52956..e80e7feb6a61a53de26bc5322676e76c1f7184c0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/LogAggregationService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/LogAggregationService.java @@ -281,7 +281,6 @@ protected void closeFileSystems(final UserGroupInformation userUgi) { } // for testing only - @Private int getNumAggregators() { return this.appLogAggregators.size(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/NoneContainerLogAggregationPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/NoneContainerLogAggregationPolicy.java index 86dcd5487aa075e3872e21f67e98d67de06a62cf..1f77d335a39d9dae0e5eeaadf8515c0390989363 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/NoneContainerLogAggregationPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/NoneContainerLogAggregationPolicy.java @@ -21,10 +21,9 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.yarn.server.api.ContainerLogContext; -@Private public class NoneContainerLogAggregationPolicy extends AbstractContainerLogAggregationPolicy { public boolean shouldDoLogAggregation(ContainerLogContext logContext) { return false; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/SampleContainerLogAggregationPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/SampleContainerLogAggregationPolicy.java index 03f548c7a249e8b766fe26070ff614405c757ceb..c4340ab9c0ddb0fb0123a12ea8677e87bd88f217 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/SampleContainerLogAggregationPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/SampleContainerLogAggregationPolicy.java @@ -38,7 +38,6 @@ * worker containers, 20 + (100-20) * 0.2 = 36 containers's logs will be * aggregated. */ -@Private public class SampleContainerLogAggregationPolicy implements ContainerLogAggregationPolicy { private static final Logger LOG = @@ -121,4 +120,4 @@ public boolean shouldDoLogAggregation(ContainerLogContext logContext) { return (sampleRate != 0 && logContext.getContainerId().hashCode() % (1/sampleRate) == 0); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainersMonitorImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainersMonitorImpl.java index 2b99cc7254bb6875f9cb26d34e94fe38270e0987..2f727ba3ed43e09685b5e2eb50c86d2f6602d2b9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainersMonitorImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainersMonitorImpl.java @@ -92,7 +92,6 @@ /** * Type of container metric. */ - @Private public enum ContainerMetric { CPU, MEMORY } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntimeConstants.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntimeConstants.java index 4473856a2d6ef5ecd0ccc3f65e93e349d90abcc2..3c09ac95d0211503d485fc338a94d9cd08f36b0a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntimeConstants.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntimeConstants.java @@ -27,7 +27,6 @@ /* Switch container runtimes. Work in progress: These * parameters may be changed/removed in the future. */ - @Private public static final String ENV_CONTAINER_TYPE = "YARN_CONTAINER_RUNTIME_TYPE"; } diff --git 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMStateStoreService.java index 999d2d9dbaf532f23a6d6e171986dc9c724c9ff7..7e22dc3f4ac977b89193a1abd12141f3c25a3b8f 100644 --- 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMStateStoreService.java @@ -45,8 +45,6 @@ import org.apache.hadoop.yarn.server.api.records.MasterKey; import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ResourceMappings; -@Private -@Unstable public abstract class NMStateStoreService extends AbstractService { public NMStateStoreService(String name) { diff --git 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMContainerTokenSecretManager.java index 256f649cabfc146cd63223b1c42dd4ef1e592630..2543119e969b9ac35f93d7ec6a1a9b446d3c2efc 100644 --- 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMContainerTokenSecretManager.java @@ -130,7 +130,6 @@ private void updatePreviousMasterKey(MasterKeyData key) { * * @param masterKeyRecord */ - @Private public synchronized void setMasterKey(MasterKey masterKeyRecord) { // Update keys only if the key has changed. if (super.currentMasterKey == null || super.currentMasterKey.getMasterKey() @@ -259,4 +258,4 @@ public synchronized void setNodeId(NodeId nodeId) { nodeHostAddr = nodeId.toString(); LOG.info("Updating node address : " + nodeHostAddr); } -} \ No newline at end of file +} diff --git 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMTokenSecretManagerInNM.java index 0956e77f7fa37753f24c7bd40d519e59bfee58d8..78b0280b6281b287f373cd9b3d26bf22af53ea6a 100644 --- 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/NMTokenSecretManagerInNM.java @@ -130,7 +130,6 @@ private void updatePreviousMasterKey(MasterKeyData key) { * obtained from the RM. This can happen during registration or when the RM * rolls the master-key and signal the NM. */ - @Private public synchronized void setMasterKey(MasterKey masterKey) { // Update keys only if the key has changed. if (super.currentMasterKey == null || super.currentMasterKey.getMasterKey() @@ -253,14 +252,12 @@ public synchronized void setNodeId(NodeId nodeId) { this.nodeId = nodeId; } - @Private @VisibleForTesting public synchronized boolean isAppAttemptNMTokenKeyPresent(ApplicationAttemptId appAttemptId) { return oldMasterKeys.containsKey(appAttemptId); } - @Private @VisibleForTesting public synchronized NodeId getNodeId() { return this.nodeId; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMWebServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMWebServices.java index c5379ccf2584750bda1587e1d8b56599a89c1612..7aa7aefff937d977c87d2cc9e3f4aa2b10be19c5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMWebServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMWebServices.java @@ -330,8 +330,6 @@ public Response getContainerLogsInfo( @GET @Path("/containers/{containerid}/logs/{filename}") @Produces({ MediaType.TEXT_PLAIN + "; " + JettyUtils.UTF_8 }) - @Public - @Unstable public Response getContainerLogFile( @PathParam(YarnWebServiceParams.CONTAINER_ID) final String containerIdStr, @@ -365,8 +363,6 @@ public Response getContainerLogFile( @GET @Path("/containerlogs/{containerid}/{filename}") @Produces({ MediaType.TEXT_PLAIN + "; " + JettyUtils.UTF_8 }) - @Public - @Unstable public Response getLogs( @PathParam(YarnWebServiceParams.CONTAINER_ID) final String containerIdStr, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java index 6c0a854122387fbf66e3fc98316e56a9042c899e..03dafa37c4a54806d2fc0ad33387f6712372012a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java @@ -400,7 +400,6 @@ public RefreshQueuesResponse refreshQueues(RefreshQueuesRequest request) } } - @Private public void refreshQueues() throws IOException, YarnException { rm.getRMContext().getScheduler().reinitialize(getConfig(), this.rm.getRMContext()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java index 90c42be8d44494494ed83673abca939ca8be0444..0d5a7648a5f76e9964107658d2b7170ff86444ea 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java @@ -76,7 +76,6 @@ import com.google.common.annotations.VisibleForTesting; @SuppressWarnings("unchecked") -@Private public class ApplicationMasterService extends AbstractService implements ApplicationMasterProtocol { private static final Log LOG = LogFactory.getLog(ApplicationMasterService.class); @@ -183,7 +182,6 @@ protected AMSProcessingChain getProcessingChain() { return this.amsProcessingChain; } - @Private public InetSocketAddress getBindAddress() { return this.masterServiceAddress; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index a0c3db622b43220b4d022dc5561bb5a859bd9a39..e8d25bce4449dfccca43d52ca704b7cce8dd8c41 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -306,7 +306,6 @@ InetSocketAddress getBindAddress(Configuration conf) { YarnConfiguration.DEFAULT_RM_PORT); } - @Private public InetSocketAddress getBindAddress() { return clientBindAddress; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java index 9dc594514997c9b95b67f981fe8eb4141ed5f58c..a22e7df937ec04ad8bfb29fa88cc05a40c5c2f21 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java @@ -57,8 +57,6 @@ * context. Services that need to run only on the Active RM. This is expected to * be used only by RMContext. */ -@Private -@Unstable public class RMActiveServiceContext { private static final Log LOG = LogFactory @@ -112,8 +110,6 @@ public RMActiveServiceContext() { queuePlacementManager = new PlacementManager(); } - @Private - @Unstable public RMActiveServiceContext(Dispatcher rmDispatcher, ContainerAllocationExpirer containerAllocationExpirer, AMLivelinessMonitor amLivelinessMonitor, @@ -145,279 +141,189 @@ public RMActiveServiceContext(Dispatcher rmDispatcher, } } - @Private - @Unstable public void setStateStore(RMStateStore store) { stateStore = store; } - @Private - @Unstable public ClientRMService getClientRMService() { return clientRMService; } - @Private - @Unstable public ApplicationMasterService getApplicationMasterService() { return applicationMasterService; } - @Private - @Unstable public ResourceTrackerService getResourceTrackerService() { return resourceTrackerService; } - @Private - @Unstable public RMStateStore getStateStore() { return stateStore; } - @Private - @Unstable public ConcurrentMap getRMApps() { return this.applications; } - @Private - @Unstable public ConcurrentMap getRMNodes() { return this.nodes; } - @Private - @Unstable public ConcurrentMap getInactiveRMNodes() { return this.inactiveNodes; } - @Private - @Unstable public ContainerAllocationExpirer getContainerAllocationExpirer() { return this.containerAllocationExpirer; } - @Private - @Unstable public AMLivelinessMonitor getAMLivelinessMonitor() { return this.amLivelinessMonitor; } - @Private - @Unstable public AMLivelinessMonitor getAMFinishingMonitor() { return this.amFinishingMonitor; } - @Private - @Unstable public DelegationTokenRenewer getDelegationTokenRenewer() { return delegationTokenRenewer; } - @Private - @Unstable public AMRMTokenSecretManager getAMRMTokenSecretManager() { return this.amRMTokenSecretManager; } - @Private - @Unstable public RMContainerTokenSecretManager getContainerTokenSecretManager() { return this.containerTokenSecretManager; } - @Private - @Unstable public NMTokenSecretManagerInRM getNMTokenSecretManager() { return this.nmTokenSecretManager; } - @Private - @Unstable public ResourceScheduler getScheduler() { return this.scheduler; } - @Private - @Unstable public ReservationSystem getReservationSystem() { return this.reservationSystem; } - @Private - @Unstable public NodesListManager getNodesListManager() { return this.nodesListManager; } - @Private - @Unstable public ClientToAMTokenSecretManagerInRM getClientToAMTokenSecretManager() { return this.clientToAMTokenSecretManager; } - @Private - @Unstable public void setClientRMService(ClientRMService clientRMService) { this.clientRMService = clientRMService; } - @Private - @Unstable public RMDelegationTokenSecretManager getRMDelegationTokenSecretManager() { return this.rmDelegationTokenSecretManager; } - @Private - @Unstable public void setRMDelegationTokenSecretManager( RMDelegationTokenSecretManager delegationTokenSecretManager) { this.rmDelegationTokenSecretManager = delegationTokenSecretManager; } - @Private - @Unstable void setContainerAllocationExpirer( ContainerAllocationExpirer containerAllocationExpirer) { this.containerAllocationExpirer = containerAllocationExpirer; } - @Private - @Unstable void setAMLivelinessMonitor(AMLivelinessMonitor amLivelinessMonitor) { this.amLivelinessMonitor = amLivelinessMonitor; } - @Private - @Unstable void setAMFinishingMonitor(AMLivelinessMonitor amFinishingMonitor) { this.amFinishingMonitor = amFinishingMonitor; } - @Private - @Unstable void setContainerTokenSecretManager( RMContainerTokenSecretManager containerTokenSecretManager) { this.containerTokenSecretManager = containerTokenSecretManager; } - @Private - @Unstable void setNMTokenSecretManager(NMTokenSecretManagerInRM nmTokenSecretManager) { this.nmTokenSecretManager = nmTokenSecretManager; } - @Private - @Unstable void setScheduler(ResourceScheduler scheduler) { this.scheduler = scheduler; } - @Private - @Unstable void setReservationSystem(ReservationSystem reservationSystem) { this.reservationSystem = reservationSystem; } - @Private - @Unstable void setDelegationTokenRenewer(DelegationTokenRenewer delegationTokenRenewer) { this.delegationTokenRenewer = delegationTokenRenewer; } - @Private - @Unstable void setClientToAMTokenSecretManager( ClientToAMTokenSecretManagerInRM clientToAMTokenSecretManager) { this.clientToAMTokenSecretManager = clientToAMTokenSecretManager; } - @Private - @Unstable void setAMRMTokenSecretManager(AMRMTokenSecretManager amRMTokenSecretManager) { this.amRMTokenSecretManager = amRMTokenSecretManager; } - @Private - @Unstable void setNodesListManager(NodesListManager nodesListManager) { this.nodesListManager = nodesListManager; } - @Private - @Unstable void setApplicationMasterService( ApplicationMasterService applicationMasterService) { this.applicationMasterService = applicationMasterService; } - @Private - @Unstable void setResourceTrackerService(ResourceTrackerService resourceTrackerService) { this.resourceTrackerService = resourceTrackerService; } - @Private - @Unstable public void setWorkPreservingRecoveryEnabled(boolean enabled) { this.isWorkPreservingRecoveryEnabled = enabled; } - @Private - @Unstable public boolean isWorkPreservingRecoveryEnabled() { return this.isWorkPreservingRecoveryEnabled; } - @Private - @Unstable public long getEpoch() { return this.epoch; } - @Private - @Unstable void setEpoch(long epoch) { this.epoch = epoch; } - @Private - @Unstable public RMNodeLabelsManager getNodeLabelManager() { return nodeLabelManager; } - @Private - @Unstable public void setNodeLabelManager(RMNodeLabelsManager mgr) { nodeLabelManager = mgr; } - @Private - @Unstable public RMDelegatedNodeLabelsUpdater getRMDelegatedNodeLabelsUpdater() { return rmDelegatedNodeLabelsUpdater; } - @Private - @Unstable public void setRMDelegatedNodeLabelsUpdater( RMDelegatedNodeLabelsUpdater nodeLablesUpdater) { rmDelegatedNodeLabelsUpdater = nodeLablesUpdater; } - @Private - @Unstable public void setSchedulerRecoveryStartAndWaitTime(long waitTime) { this.schedulerRecoveryStartTime = systemClock.getTime(); this.schedulerRecoveryWaitTime = waitTime; } - @Private - @Unstable public boolean isSchedulerReadyForAllocatingContainers() { if (isSchedulerReady) { return isSchedulerReady; @@ -434,51 +340,35 @@ public boolean isSchedulerReadyForAllocatingContainers() { return isSchedulerReady; } - @Private - @Unstable public void setSystemClock(Clock clock) { this.systemClock = clock; } - @Private - @Unstable public ConcurrentMap getSystemCredentialsForApps() { return systemCredentials; } - @Private - @Unstable public PlacementManager getQueuePlacementManager() { return queuePlacementManager; } - @Private - @Unstable public void setQueuePlacementManager(PlacementManager placementMgr) { this.queuePlacementManager = placementMgr; } - @Private - @Unstable public void setRMAppLifetimeMonitor( RMAppLifetimeMonitor lifetimeMonitor) { this.rmAppLifetimeMonitor = lifetimeMonitor; } - @Private - @Unstable public RMAppLifetimeMonitor getRMAppLifetimeMonitor() { return this.rmAppLifetimeMonitor; } - @Private - @Unstable public QueueLimitCalculator getNodeManagerQueueLimitCalculator() { return this.queueLimitCalculator; } - @Private - @Unstable public void setContainerQueueLimitCalculator( QueueLimitCalculator limitCalculator) { this.queueLimitCalculator = limitCalculator; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java index 80a9109627107f1ec563995e2dc176e9aebf6fe8..e48dec49ea55209d1bb84246c61819030422a491 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java @@ -157,8 +157,6 @@ public RMContextImpl(Dispatcher rmDispatcher, * once during start of RM. * @return serviceContext of RM */ - @Private - @Unstable public RMServiceContext getServiceContext() { return serviceContext; } @@ -167,8 +165,6 @@ public RMServiceContext getServiceContext() { * Note: setting service context clears all services embedded with it. * @param context rm service context */ - @Private - @Unstable public void setServiceContext(RMServiceContext context) { this.serviceContext = context; } @@ -290,14 +286,10 @@ public String getHAZookeeperConnectionState() { * ACTIVE to STANDBY. * @return activeServiceContext of active services */ - @Private - @Unstable public RMActiveServiceContext getActiveServiceContext() { return activeServiceContext; } - @Private - @Unstable void setActiveServiceContext(RMActiveServiceContext activeServiceContext) { this.activeServiceContext = activeServiceContext; } @@ -523,7 +515,6 @@ public boolean isSchedulerReadyForAllocatingContainers() { return activeServiceContext.isSchedulerReadyForAllocatingContainers(); } - @Private @VisibleForTesting public void setSystemClock(Clock clock) { activeServiceContext.setSystemClock(clock); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMCriticalThreadUncaughtExceptionHandler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMCriticalThreadUncaughtExceptionHandler.java index c863889f12a161a1d4bf29bd226adc86544c6a17..369828d051c2ba43ae5bdd51a6dc0b3b76002339 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMCriticalThreadUncaughtExceptionHandler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMCriticalThreadUncaughtExceptionHandler.java @@ -32,7 +32,6 @@ * {@code setUncaughtExceptionHandler(Thread.UncaughtExceptionHandler)} * in the thread entry point or after creation of threads. */ -@Private public class RMCriticalThreadUncaughtExceptionHandler implements UncaughtExceptionHandler { private static final Log LOG = LogFactory.getLog( diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServiceContext.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServiceContext.java index 45c61667cf9b4420bd673712009f34cfe2d64e1c..b67f1145c3fd58964a88c5602bedc8c9a7400096 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServiceContext.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServiceContext.java @@ -37,8 +37,6 @@ * Note: If any services to be added in this class, make sure service * will be running always irrespective of the HA state of the RM */ -@Private -@Unstable public class RMServiceContext { private Dispatcher rmDispatcher; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index 07f5a769293e0af0795d56e47c2f593c704e0775..a2574e8bffeae592e6af9a0ef40ae516e3930177 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -566,7 +566,6 @@ protected static void validateConfigs(Configuration conf) { /** * RMActiveServices handles all the Active services in the RM. */ - @Private public class RMActiveServices extends CompositeService { private DelegationTokenRenewer delegationTokenRenewer; @@ -835,7 +834,6 @@ protected void createSchedulerMonitors() { } } - @Private private class RMFatalEventDispatcher implements EventHandler { @Override public void handle(RMFatalEvent event) { @@ -927,7 +925,6 @@ public void run() { } } - @Private public static final class ApplicationEventDispatcher implements EventHandler { @@ -952,7 +949,6 @@ public void handle(RMAppEvent event) { } } - @Private public static final class ApplicationAttemptEventDispatcher implements EventHandler { @@ -1008,7 +1004,6 @@ public void handle(RMAppAttemptEvent event) { } } - @Private public static final class NodeEventDispatcher implements EventHandler { @@ -1344,7 +1339,6 @@ protected RMDelegatedNodeLabelsUpdater createRMDelegatedNodeLabelsUpdater() { } } - @Private public ClientRMService getClientRMService() { return this.clientRM; } @@ -1353,7 +1347,6 @@ public ClientRMService getClientRMService() { * return the scheduler. * @return the scheduler for the Resource Manager. */ - @Private public ResourceScheduler getResourceScheduler() { return this.scheduler; } @@ -1362,33 +1355,27 @@ public ResourceScheduler getResourceScheduler() { * return the resource tracking component. * @return the resource tracking component. */ - @Private public ResourceTrackerService getResourceTrackerService() { return this.resourceTracker; } - @Private public ApplicationMasterService getApplicationMasterService() { return this.masterService; } - @Private public ApplicationACLsManager getApplicationACLsManager() { return this.applicationACLsManager; } - @Private public QueueACLsManager getQueueACLsManager() { return this.queueACLsManager; } - @Private @VisibleForTesting public FederationStateStoreService getFederationStateStoreService() { return this.federationStateStoreService; } - @Private WebApp getWebapp() { return this.webApp; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java index 19c5c27f9612c2c5775eb123ed638987b0904f7f..44b4b2aff16e348d284ba2071cdbe3d3f01141a1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java @@ -65,8 +65,6 @@ * {@link ApplicationHistoryStore}. *

    */ -@Private -@Unstable public class RMApplicationHistoryWriter extends CompositeService { public static final Log LOG = LogFactory diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java index 7051f8cca26d95b21670a82d3313bedd9046c89f..2cf43e2746684636b6086e2518c0911f79fd2295 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java @@ -197,7 +197,6 @@ private ContainerLaunchContext createAMContainerLaunchContext( return container; } - @Private @VisibleForTesting protected void setupTokens( ContainerLaunchContext container, ContainerId containerID) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/BlacklistManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/BlacklistManager.java index f343603c10c425b2381917e88c5462f2adff49d5..0dbce7dfa1367dc4f16b185499e5af25a7f50a6a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/BlacklistManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/BlacklistManager.java @@ -24,7 +24,6 @@ /** * Tracks blacklists based on failures reported on nodes. */ -@Private public interface BlacklistManager { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java index 7eaa6e7feb50c73ebde8528325937e08fabd22d7..0e9075460c95b7f3463c69d4863c01f811c4c95b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java @@ -67,8 +67,6 @@ * This class is responsible for posting application, appattempt & Container * lifecycle related events to timeline service v2. */ -@Private -@Unstable public class TimelineServiceV2Publisher extends AbstractSystemMetricsPublisher { private static final Log LOG = LogFactory.getLog(TimelineServiceV2Publisher.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/CapacitySchedulerPreemptionContext.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/CapacitySchedulerPreemptionContext.java index d6f3f6c6d42e9eeb6939b7da47d05053db4bf651..7545c3d2586b99714bab88aaddc5000cae5ca04c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/CapacitySchedulerPreemptionContext.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/CapacitySchedulerPreemptionContext.java @@ -66,6 +66,5 @@ TempQueuePerPartition getQueueByPartition(String queueName, float getMaxAllowableLimitForIntraQueuePreemption(); - @Unstable IntraQueuePreemptionOrderPolicy getIntraQueuePreemptionOrderPolicy(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java index c4c98e2302c55e5d02c0dd28a2d53182f2597e9e..cb60244232268c8c082f6670d6517cbfa8b0de83 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java @@ -85,7 +85,6 @@ * IntraQueuePreemptionOrder will be used to define various priority orders * which could be configured by admin. */ - @Unstable public enum IntraQueuePreemptionOrderPolicy { PRIORITY_FIRST, USERLIMIT_FIRST; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java index d617d161859198f43290381a2ca5d7d5b1209f62..e6eeb7be42e11a82a16abf3ffbcd280bb49c0723 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java @@ -45,7 +45,6 @@ private List mappings = null; private Groups groups; - @Private public static class QueueMapping { public enum MappingType { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java index 7cbeda3a3dd9bdd8ee0c088ac86d26b3ab7653e3..1f4f8bbb32bbaae6c156a28ebbb97fd29475ce23 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java @@ -68,8 +68,6 @@ import com.google.common.annotations.VisibleForTesting; -@Private -@Unstable /** * A simple class for storing RM state in any storage that implements a basic * FileSystem interface. Does not use directories so that simple key-value @@ -99,7 +97,6 @@ protected Configuration fsConf; private Path rootDirPath; - @Private @VisibleForTesting Path rmDTSecretManagerRoot; private Path rmAppRoot; @@ -827,7 +824,6 @@ protected void replaceFile(Path srcPath, Path dstPath) throws Exception { renameFileWithRetries(srcPath, dstPath); } - @Private @VisibleForTesting boolean renameFile(Path src, Path dst) throws Exception { return fs.rename(src, dst); @@ -837,7 +833,6 @@ private boolean createFile(Path newFile) throws Exception { return fs.createNewFile(newFile); } - @Private @VisibleForTesting Path getNodePath(Path root, String nodeName) { return new Path(root, nodeName); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java index 5041000f0baaeac3c66bf6b68f7788228d76c21b..9b287ad1683290383d9f65f081b138dc6dc8420f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java @@ -40,8 +40,6 @@ import com.google.common.annotations.VisibleForTesting; -@Private -@Unstable public class MemoryRMStateStore extends RMStateStore { RMState state = new RMState(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/NullRMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/NullRMStateStore.java index 4e134ac9c4c1989981fcfefb11e51090bb969a01..9ebe3f94fc2c9bd5d51bc241b7ec0c5c206a4d90 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/NullRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/NullRMStateStore.java @@ -31,7 +31,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationAttemptStateData; import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData; -@Unstable public class NullRMStateStore extends RMStateStore { @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java index 00ef39fdd98525a429340a349e7d53dae1b9c898..7b7e67c7ed76276ceadfe2bb86459ff27f0c7fef 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java @@ -75,8 +75,6 @@ import org.apache.hadoop.yarn.state.StateMachine; import org.apache.hadoop.yarn.state.StateMachineFactory; -@Private -@Unstable /** * Base class to implement storage of ResourceManager state. * Takes care of asynchronous notifications and interfacing with YARN objects. diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java 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 5bff77f341695cca13c00ab2b4911ad3d33cec15..71887ecf15758bbd9abb72588b077349701c40e6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java @@ -148,8 +148,6 @@ * the number of application znodes returned in a single call while loading * app state. */ -@Private -@Unstable public class ZKRMStateStore extends RMStateStore { private static final Log LOG = LogFactory.getLog(ZKRMStateStore.class); @@ -239,8 +237,6 @@ * algorithm used by Zookeeper cannot be found */ @VisibleForTesting - @Private - @Unstable protected List constructZkRootNodeACL(Configuration conf, List sourceACLs) throws NoSuchAlgorithmException { List zkRootNodeAclList = new ArrayList<>(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/AMRMTokenSecretManagerState.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/AMRMTokenSecretManagerState.java index 89b4ff0fc7ad245da1c6f921a82ae6541056fc4e..511e46bbea5da3a6d9bd1159ccae71215da78350 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/AMRMTokenSecretManagerState.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/AMRMTokenSecretManagerState.java @@ -29,8 +29,6 @@ * Contains all the state data that needs to be stored persistently * for {@link AMRMTokenSecretManager} */ -@Public -@Unstable public abstract class AMRMTokenSecretManagerState { public static AMRMTokenSecretManagerState newInstance( MasterKey currentMasterKey, MasterKey nextMasterKey) { @@ -53,23 +51,15 @@ public static AMRMTokenSecretManagerState newInstance( /** * {@link AMRMTokenSecretManager} current Master key */ - @Public - @Unstable public abstract MasterKey getCurrentMasterKey(); - @Public - @Unstable public abstract void setCurrentMasterKey(MasterKey currentMasterKey); /** * {@link AMRMTokenSecretManager} next Master key */ - @Public - @Unstable public abstract MasterKey getNextMasterKey(); - @Public - @Unstable public abstract void setNextMasterKey(MasterKey nextMasterKey); public abstract AMRMTokenSecretManagerStateProto getProto(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java index 2de071ad2ec8a94a4410587e2ed3d153a0e6ff8b..48b5211fd9a6fb0f5bd5d1ee78705a0c8e9348bc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java @@ -36,8 +36,6 @@ /* * Contains the state data that needs to be persisted for an ApplicationAttempt */ -@Public -@Unstable public abstract class ApplicationAttemptStateData { public static ApplicationAttemptStateData newInstance( @@ -94,8 +92,6 @@ public static ApplicationAttemptStateData newInstance( * The ApplicationAttemptId for the application attempt * @return ApplicationAttemptId for the application attempt */ - @Public - @Unstable public abstract ApplicationAttemptId getAttemptId(); public abstract void setAttemptId(ApplicationAttemptId attemptId); @@ -104,8 +100,6 @@ public static ApplicationAttemptStateData newInstance( * The master container running the application attempt * @return Container that hosts the attempt */ - @Public - @Unstable public abstract Container getMasterContainer(); public abstract void setMasterContainer(Container container); @@ -114,8 +108,6 @@ public static ApplicationAttemptStateData newInstance( * The application attempt tokens that belong to this attempt * @return The application attempt tokens that belong to this attempt */ - @Public - @Unstable public abstract Credentials getAppAttemptTokens(); public abstract void setAppAttemptTokens(Credentials attemptTokens); @@ -183,24 +175,16 @@ public abstract void setFinalApplicationStatus( * Get the memory seconds (in MB seconds) of the application. * @return memory seconds (in MB seconds) of the application */ - @Public - @Unstable public abstract long getMemorySeconds(); - @Public - @Unstable public abstract void setMemorySeconds(long memorySeconds); /** * Get the vcore seconds of the application. * @return vcore seconds of the application */ - @Public - @Unstable public abstract long getVcoreSeconds(); - @Public - @Unstable public abstract void setVcoreSeconds(long vcoreSeconds); /** @@ -209,12 +193,8 @@ public abstract void setFinalApplicationStatus( * @return preempted memory seconds * (in MB seconds) of the application */ - @Public - @Unstable public abstract long getPreemptedMemorySeconds(); - @Public - @Unstable public abstract void setPreemptedMemorySeconds(long memorySeconds); /** @@ -223,12 +203,8 @@ public abstract void setFinalApplicationStatus( * @return preempted vcore seconds * of the application */ - @Public - @Unstable public abstract long getPreemptedVcoreSeconds(); - @Public - @Unstable public abstract void setPreemptedVcoreSeconds(long vcoreSeconds); /** @@ -238,8 +214,6 @@ public abstract void setFinalApplicationStatus( * @return map containing the resource name and aggregated preempted * resource-seconds */ - @Public - @Unstable public abstract Map getResourceSecondsMap(); /** @@ -249,8 +223,6 @@ public abstract void setFinalApplicationStatus( * @param resourceSecondsMap map containing the resource name and aggregated * resource-seconds */ - @Public - @Unstable public abstract void setResourceSecondsMap( Map resourceSecondsMap); @@ -261,8 +233,6 @@ public abstract void setResourceSecondsMap( * @return map containing the resource name and aggregated preempted * resource-seconds */ - @Public - @Unstable public abstract Map getPreemptedResourceSecondsMap(); /** @@ -272,8 +242,6 @@ public abstract void setResourceSecondsMap( * @param preemptedResourceSecondsMap map containing the resource name and * aggregated preempted resource-seconds */ - @Public - @Unstable public abstract void setPreemptedResourceSecondsMap( Map preemptedResourceSecondsMap); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationStateData.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationStateData.java index 79a5de258460da78d0ba031ee380672dedffbbe4..5c9bd7aa9afa88d97493d7f564ba33db8484b61c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationStateData.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationStateData.java @@ -38,8 +38,6 @@ * Contains all the state data that needs to be stored persistently * for an Application */ -@Public -@Unstable public abstract class ApplicationStateData { public Map attempts = new HashMap(); @@ -116,35 +114,23 @@ public int getFirstAttemptId() { * The time at which the application was received by the Resource Manager * @return submitTime */ - @Public - @Unstable public abstract long getSubmitTime(); - @Public - @Unstable public abstract void setSubmitTime(long submitTime); /** * Get the start time of the application. * @return start time of the application */ - @Public - @Stable public abstract long getStartTime(); - @Private - @Unstable public abstract void setStartTime(long startTime); /** * The application submitter */ - @Public - @Unstable public abstract void setUser(String user); - @Public - @Unstable public abstract String getUser(); /** @@ -152,12 +138,8 @@ public int getFirstAttemptId() { * {@link ApplicationId} can be obtained from the this * @return ApplicationSubmissionContext */ - @Public - @Unstable public abstract ApplicationSubmissionContext getApplicationSubmissionContext(); - @Public - @Unstable public abstract void setApplicationSubmissionContext( ApplicationSubmissionContext context); @@ -189,10 +171,8 @@ public abstract void setApplicationSubmissionContext( public abstract void setCallerContext(CallerContext callerContext); - @Public public abstract Map getApplicationTimeouts(); - @Public public abstract void setApplicationTimeouts( Map applicationTimeouts); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/Epoch.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/Epoch.java index 714595618e71c87036291e2eb280902044e49b6f..05728658e219785fb0e655aa9b597049e3e5d0cb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/Epoch.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/Epoch.java @@ -28,8 +28,6 @@ * Epoch is incremented each time RM restart. It's used for assuring * uniqueness of ContainerId. */ -@Private -@Unstable public abstract class Epoch { public static Epoch newInstance(long sequenceNumber) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java index 5b8772c85419e06aebedf4615a3c169ee3c59295..55ad231a8bf8e1531715109ca07e0d256ddc9568 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java @@ -62,7 +62,6 @@ * {@link ResourceScheduler} */ @LimitedPrivate("yarn") -@Unstable public abstract class AbstractReservationSystem extends AbstractService implements ReservationSystem { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacityOverTimePolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacityOverTimePolicy.java index acd577475cef74135c49e8604bb4f33db446783f..3cd533679524e6c81809e76bb9777a0584dbacda 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacityOverTimePolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacityOverTimePolicy.java @@ -48,7 +48,6 @@ * reserved to super-users, or trusted systems). */ @LimitedPrivate("yarn") -@Unstable public class CapacityOverTimePolicy extends NoOverCommitPolicy { private ReservationSchedulerConfiguration conf; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacityReservationSystem.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacityReservationSystem.java index be0a7088fcb2d4afa4eb8d6447f40beeff4a8f72..9a14f32be621f2d7908d59e094bc53ea03de0fb6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacityReservationSystem.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacityReservationSystem.java @@ -38,7 +38,6 @@ * {@link CapacityScheduler} */ @LimitedPrivate("yarn") -@Unstable public class CapacityReservationSystem extends AbstractReservationSystem { private static final Logger LOG = LoggerFactory diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/NoOverCommitPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/NoOverCommitPolicy.java index 98ef5828760a83721ff5c58b7a2154f4760353bb..27cd69062f6cf8659ffbf9f0e1a87b598440585c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/NoOverCommitPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/NoOverCommitPolicy.java @@ -31,7 +31,6 @@ * constraints it conceptually remove the prior version of the reservation. */ @LimitedPrivate("yarn") -@Unstable public class NoOverCommitPolicy implements SharingPolicy { @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/ReservationSystem.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/ReservationSystem.java index a6c8fcfea74357e66d557fbc61d74ae522ff67a2..5b137fb089926f75998fd03aaf7641cddb2f6f9f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/ReservationSystem.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/ReservationSystem.java @@ -41,7 +41,6 @@ * with the {@link ResourceScheduler}. */ @LimitedPrivate("yarn") -@Unstable public interface ReservationSystem extends Recoverable { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/SharingPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/SharingPolicy.java index cbf0f38a7801e67a47f0b356d5e6857aa967b3d0..01884443290d8d10b8f5ddc2a03c626b6fe1e384 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/SharingPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/SharingPolicy.java @@ -29,7 +29,6 @@ * Individual policies will be enforcing different invariants. */ @LimitedPrivate("yarn") -@Unstable public interface SharingPolicy { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/ContractValidationException.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/ContractValidationException.java index c85dbd76de706e4243a8f8807cb9152c346881d4..9fedca135c3cc83d0256fa15eeab03db3813c83c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/ContractValidationException.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/ContractValidationException.java @@ -24,8 +24,6 @@ /** * This exception is thrown if the request made is not syntactically valid. */ -@Public -@Unstable public class ContractValidationException extends PlanningException { private static final long serialVersionUID = 1L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/PlanningException.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/PlanningException.java index fdfcada9ea439fa2ad0eb3aef712cdcf2a06eee8..66e7bae4ead13b00a57a5d1a9c01e64046e895c6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/PlanningException.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/PlanningException.java @@ -29,8 +29,6 @@ * {@link ReservationSubmissionRequest}. */ -@Public -@Unstable public class PlanningException extends Exception { private static final long serialVersionUID = -684069387367879218L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/PlanningQuotaException.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/PlanningQuotaException.java index 5c0ffc4d5ba7f8fc1a2fa756839592d3dcee4dbe..13ae8521708b0c732cb71a8403190e1dcd9258fb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/PlanningQuotaException.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/PlanningQuotaException.java @@ -25,8 +25,6 @@ * This exception is thrown if the user quota is exceed while accepting or * updating a reservation. */ -@Public -@Unstable public class PlanningQuotaException extends PlanningException { private static final long serialVersionUID = 8206629288380246166L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/ResourceOverCommitException.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/ResourceOverCommitException.java index 87f8837790de3bd4ad399d5468dabd7707b53ce1..bd3b83d371e4d0e05d7a039db6fff19b33a41df9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/ResourceOverCommitException.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/exceptions/ResourceOverCommitException.java @@ -26,8 +26,6 @@ * This exception indicate that the reservation that has been attempted, would * exceed the physical resources available in the {@link Plan} at the moment. */ -@Public -@Unstable public class ResourceOverCommitException extends PlanningException { private static final long serialVersionUID = 7070699407526521032L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/DynamicResourceConfiguration.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/DynamicResourceConfiguration.java index 65491026a9457447962fbe2bfc9c72c0f07e9bb1..4bf63cc57ae99bba71a90cdb63bc7532a5ded587 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/DynamicResourceConfiguration.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/DynamicResourceConfiguration.java @@ -40,22 +40,16 @@ private static final Log LOG = LogFactory.getLog(DynamicResourceConfiguration.class); - @Private public static final String PREFIX = "yarn.resource.dynamic."; - @Private public static final String DOT = "."; - @Private public static final String NODES = "nodes"; - @Private public static final String VCORES = "vcores"; - @Private public static final String MEMORY = "memory"; - @Private public static final String OVERCOMMIT_TIMEOUT = "overcommittimeout"; public DynamicResourceConfiguration() { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceType.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceType.java index 9dd245b26bd7f3e5f3a109674dfa722327d57ac6..a95441ae08cbd08dbc2faa0460cb65ac26eb171a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceType.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceType.java @@ -21,8 +21,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Evolving; -@Private -@Evolving public enum ResourceType { MEMORY, CPU } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java index cfb8a74f59a476e89bd9b200913105380fac0ba0..4a703bf2a2f47a13f4b40a6fda51040d59b76013 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java @@ -1645,7 +1645,6 @@ public RMAppMetrics getRMAppMetrics() { numAMContainerPreempted, resourceSecondsMap, preemptedSecondsMap); } - @Private @VisibleForTesting public void setSystemClock(Clock clock) { this.systemClock = clock; @@ -1952,7 +1951,6 @@ private void sendATSCreateEvent() { rmContext.getSystemMetricsPublisher().appCreated(this, this.startTime); } - @Private @VisibleForTesting public int getNextAttemptId() { return nextAttemptId; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/AggregateAppResourceUsage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/AggregateAppResourceUsage.java index b858712f7d6ee6f9798cbe13afde5687cb298437..d4e4e74d7d670dc159ed9b3b1ea412320900c1fe 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/AggregateAppResourceUsage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/AggregateAppResourceUsage.java @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.Map; -@Private public class AggregateAppResourceUsage { private Map resourceSecondsMap = new HashMap<>(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 4997bc60f3e6984fa7343b91eb158b9899089dd0..caa59f5ff731882571880e4b476e6873e32c7bc8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -704,7 +704,6 @@ public SecretKey getClientTokenMasterKey() { } } - @Private public void setAMRMToken(Token lastToken) { this.writeLock.lock(); try { @@ -715,7 +714,6 @@ public void setAMRMToken(Token lastToken) { } } - @Private public int getAMRMTokenKeyId() { Integer keyId = this.amrmTokenKeyId; if (keyId == null) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java index d0bfecfa0024b785e9c7e30e4758211868613ef7..3f82aaa7854a9131a191121b4a23d3d245297956 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java @@ -95,8 +95,6 @@ * running on a node. * */ -@Private -@Unstable @SuppressWarnings("unchecked") public class RMNodeImpl implements RMNode, EventHandler { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractUsersManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractUsersManager.java index 4db35845f226dc98e64ea4330b142161ccb21b18..852fa2ed373cfe02e4090c01b669172550873e26 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractUsersManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractUsersManager.java @@ -23,7 +23,6 @@ /** * {@link AbstractUsersManager} tracks users in the system. */ -@Private public interface AbstractUsersManager { /** * An application has new outstanding requests. diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java index f2da1fe61d0ee2b133e4e9a2dd1cad81234a0ce2..4d6da5df6db871a20b70c9dd5dd00c02bff62580 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java @@ -104,8 +104,6 @@ @SuppressWarnings("unchecked") -@Private -@Unstable public abstract class AbstractYarnScheduler extends AbstractService implements ResourceScheduler { @@ -639,7 +637,6 @@ public void clearPendingContainerCache() { } @VisibleForTesting - @Private // clean up a completed container public void completedContainer(RMContainer rmContainer, ContainerStatus containerStatus, RMContainerEventType event) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ActiveUsersManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ActiveUsersManager.java index 049f324793d27481e1b4542cb96c91cfc3c4a93d..75deb97d454d8a0eaa38a36e3d76a2775dae2fab 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ActiveUsersManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ActiveUsersManager.java @@ -35,7 +35,6 @@ * * An active user is defined as someone with outstanding resource requests. */ -@Private public class ActiveUsersManager implements AbstractUsersManager { private static final Log LOG = LogFactory.getLog(ActiveUsersManager.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java index 082ec14d433d693df95734c321592cba6355b828..f6db443faa136d192ec68d8f88fe2106fbfbb899 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java @@ -55,8 +55,6 @@ * This class keeps track of all the consumption of an application. This also * keeps track of current running/completed containers for the application. */ -@Private -@Unstable public class AppSchedulingInfo { private static final Log LOG = LogFactory.getLog(AppSchedulingInfo.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/NodeReport.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/NodeReport.java index 5a212d113223823697fe4c712e00f7010739040a..4a945e1dc9b0df5a7a72a9bfc232a6d55cc20de0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/NodeReport.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/NodeReport.java @@ -25,8 +25,6 @@ /** * Node usage report. */ -@Private -@Stable public class NodeReport { private final Resource usedResources; private final int numContainers; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/Queue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/Queue.java index d166e5fc568fa5b46b6acfa0d0b59fdcb359571d..d8ec2c1ef3313f0248144f672fdab9f95b805a3c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/Queue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/Queue.java @@ -31,7 +31,6 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; -@Evolving @LimitedPrivate("yarn") public interface Queue { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueInvalidException.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueInvalidException.java index 7c6be4f0ab5ff73f356895db6b53f4f10364ab12..0359b551d7c535fb4efa9d1648ee32f14fe5a0c0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueInvalidException.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueInvalidException.java @@ -21,7 +21,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; -@Private public class QueueInvalidException extends YarnRuntimeException { private static final long serialVersionUID = 187239430L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java index eafe8edfcc945d8bc95242a6aa4955297c17f99f..6092be23120ba45acaa9f5a0b87bd4022b197679 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java @@ -148,7 +148,6 @@ static QueueMetrics forQueue(String queueName, Queue parent, /** * Helper method to clear cache. */ - @Private public synchronized static void clearQueueMetrics() { QUEUE_METRICS.clear(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java index 761817e455f7be7b6e6e4aec59f12ede7cad6e69..cd477cbe5be9c04cd3fae24d58eaaf801ae1ba40 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java @@ -33,8 +33,6 @@ // TODO: The class will be used by YARN-5734-OrgQueue for // easy CapacityScheduler queue configuration management. @SuppressWarnings("rawtypes") -@Private -@Unstable public class QueueStateManager { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceScheduler.java index d96d62545c85d3133453d8a5b6d3e48e21545bbc..4fb908918a68a6c18320ac0f66eec09be9b572b0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceScheduler.java @@ -34,7 +34,6 @@ * */ @LimitedPrivate("yarn") -@Evolving public interface ResourceScheduler extends YarnScheduler, Recoverable { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerAppReport.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerAppReport.java index 669b97a841bd5ed0c40a49129aa769adc317c42f..70a98c4edf613ed4865ff2e1332d27edb8d6a130 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerAppReport.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerAppReport.java @@ -28,7 +28,6 @@ * Represents an application attempt, and the resources that the attempt is * using. */ -@Evolving @LimitedPrivate("yarn") public class SchedulerAppReport { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplication.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplication.java index 96288f8b9f312f7feaf1ca945345989e48351ec4..3191f91590ba2b5eb869da7f78cc7349acd061a1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplication.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplication.java @@ -22,8 +22,6 @@ import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState; -@Private -@Unstable public class SchedulerApplication { private Queue queue; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java index db63cd868d0737c343a45c5a0c898908579fcd0c..4991911c44b8e3feacaeac3a10f99aa1bb6552c9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java @@ -97,8 +97,6 @@ * Each running app attempt in the RM corresponds to one instance * of this class. */ -@Private -@Unstable public class SchedulerApplicationAttempt implements SchedulableEntity { private static final Log LOG = LogFactory @@ -416,8 +414,6 @@ public int getReReservations(SchedulerRequestKey schedulerKey) { * Used only by unit tests * @return total current reservations */ - @Stable - @Private public Resource getCurrentReservation() { return attemptResourceUsage.getReserved(); } @@ -1198,7 +1194,6 @@ public void recordContainerAllocationTime(long value) { return this.appSchedulingInfo.getBlackListCopy(); } - @Private public boolean hasPendingResourceRequest(ResourceCalculator rc, String nodePartition, Resource cluster, SchedulingMode schedulingMode) { @@ -1393,4 +1388,4 @@ public String getDiagnosticMessage() { return diagnosticMessage; } } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java index 05dbf1e51a578278ee2267f67419a5e8de38d176..7e1432c1f8cf140a3e68646239d9a46d84f93e2e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java @@ -51,8 +51,6 @@ /** * Represents a YARN Cluster Node from the viewpoint of the scheduler. */ -@Private -@Unstable public abstract class SchedulerNode { private static final Log LOG = LogFactory.getLog(SchedulerNode.class); @@ -463,4 +461,4 @@ public ContainerInfo(RMContainer container, boolean launchedOnNode) { this.launchedOnNode = launchedOnNode; } } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNodeReport.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNodeReport.java index fa71a257343f99141c5bb3d72ab320df6c8a8d96..d95f517cde1ce80a1657e8e977863752104b11da 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNodeReport.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNodeReport.java @@ -25,8 +25,6 @@ /** * Node usage report. */ -@Private -@Stable public class SchedulerNodeReport { private final Resource used; private final Resource avail; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerQueueManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerQueueManager.java index 24797a6b7b4401b7076dc0a73e1b8088936215a1..58db0239247ddc81df60535a9f9443598bf9abd0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerQueueManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerQueueManager.java @@ -30,8 +30,6 @@ * */ @SuppressWarnings("rawtypes") -@Private -@Unstable public interface SchedulerQueueManager { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java index c558b8dd9126840a5d1f267453c7a270e418677d..fe22180c26f07edfe133e07867afdc9da53c8b8c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java @@ -56,8 +56,6 @@ /** * Utilities shared by schedulers. */ -@Private -@Unstable public class SchedulerUtils { private static final Log LOG = LogFactory.getLog(SchedulerUtils.class); @@ -378,7 +376,6 @@ private static boolean hasPendingResourceRequest(ResourceCalculator rc, return false; } - @Private public static boolean hasPendingResourceRequest(ResourceCalculator rc, ResourceUsage usage, String nodePartition, Resource cluster, SchedulingMode schedulingMode) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java index 111998bae6f15d686dd90281a3fc32022eff8564..d06392094d4254e55f4324e50fb0cd28499c57f0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java @@ -67,8 +67,6 @@ * @return queue information * @throws IOException */ - @Public - @Stable public QueueInfo getQueueInfo(String queueName, boolean includeChildQueues, boolean recursive) throws IOException; @@ -76,8 +74,6 @@ public QueueInfo getQueueInfo(String queueName, boolean includeChildQueues, * Get acls for queues for current user. * @return acls for queues for current user */ - @Public - @Stable public List getQueueUserAclInfo(); /** @@ -85,23 +81,18 @@ public QueueInfo getQueueInfo(String queueName, boolean includeChildQueues, * @return the whole resource capacity of the cluster. */ @LimitedPrivate("yarn") - @Unstable public Resource getClusterResource(); /** * Get minimum allocatable {@link Resource}. * @return minimum allocatable resource */ - @Public - @Stable public Resource getMinimumResourceCapability(); /** * Get maximum allocatable {@link Resource} at the cluster level. * @return maximum allocatable resource */ - @Public - @Stable public Resource getMaximumResourceCapability(); /** @@ -109,20 +100,15 @@ public QueueInfo getQueueInfo(String queueName, boolean includeChildQueues, * @param queueName queue name * @return maximum allocatable resource */ - @Public - @Stable public Resource getMaximumResourceCapability(String queueName); @LimitedPrivate("yarn") - @Evolving ResourceCalculator getResourceCalculator(); /** * Get the number of nodes available in the cluster. * @return the number of available nodes. */ - @Public - @Stable public int getNumClusterNodes(); /** @@ -138,8 +124,6 @@ public QueueInfo getQueueInfo(String queueName, boolean includeChildQueues, * @param updateRequests * @return the {@link Allocation} for the application */ - @Public - @Stable Allocation allocate(ApplicationAttemptId appAttemptId, List ask, List release, List blacklistAdditions, List blacklistRemovals, @@ -152,7 +136,6 @@ Allocation allocate(ApplicationAttemptId appAttemptId, * if nodeId does not point to a defined node. */ @LimitedPrivate("yarn") - @Stable public SchedulerNodeReport getNodeReport(NodeId nodeId); /** @@ -161,7 +144,6 @@ Allocation allocate(ApplicationAttemptId appAttemptId, * @return SchedulerApp for this given attempt. */ @LimitedPrivate("yarn") - @Stable SchedulerAppReport getSchedulerAppInfo(ApplicationAttemptId appAttemptId); /** @@ -170,7 +152,6 @@ Allocation allocate(ApplicationAttemptId appAttemptId, * @return resource usage report for this given attempt */ @LimitedPrivate("yarn") - @Evolving ApplicationResourceUsageReport getAppResourceUsageReport( ApplicationAttemptId appAttemptId); @@ -179,7 +160,6 @@ ApplicationResourceUsageReport getAppResourceUsageReport( * @return the root queue for the scheduler. */ @LimitedPrivate("yarn") - @Evolving QueueMetrics getRootQueueMetrics(); /** @@ -201,7 +181,6 @@ boolean checkAccess(UserGroupInformation callerUGI, * @return a collection of app attempt ids in the given queue. */ @LimitedPrivate("yarn") - @Stable public List getAppsInQueue(String queueName); /** @@ -210,7 +189,6 @@ boolean checkAccess(UserGroupInformation callerUGI, * @return the container for the given containerId. */ @LimitedPrivate("yarn") - @Unstable public RMContainer getRMContainer(ContainerId containerId); /** @@ -221,7 +199,6 @@ boolean checkAccess(UserGroupInformation callerUGI, * @throws YarnException if the move cannot be carried out */ @LimitedPrivate("yarn") - @Evolving public String moveApplication(ApplicationId appId, String newQueue) throws YarnException; @@ -232,7 +209,6 @@ public String moveApplication(ApplicationId appId, String newQueue) * @throws YarnException if the pre-validation for move cannot be carried out */ @LimitedPrivate("yarn") - @Evolving public void preValidateMoveApplication(ApplicationId appId, String newQueue) throws YarnException; @@ -393,8 +369,6 @@ public Priority updateApplicationPriority(Priority newPriority, * @param lifetime configured application lifetime * @return valid lifetime as per queue */ - @Public - @Evolving long checkAndGetApplicationLifetime(String queueName, long lifetime); /** @@ -402,7 +376,5 @@ public Priority updateApplicationPriority(Priority newPriority, * @param queueName to get lifetime * @return maximum lifetime in seconds */ - @Public - @Evolving long getMaximumApplicationLifetime(String queueName); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java index 250f4e6b9a763bf95dbdb51366e162feaddc4204..eae2637b2bcf6a943f2883813417dbacc4a8da28 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java @@ -484,12 +484,10 @@ public QueueStatistics getQueueStatistics() { return queueConfigurations; } - @Private public Resource getMaximumAllocation() { return maximumAllocation; } - @Private public Resource getMinimumAllocation() { return minimumAllocation; } @@ -524,12 +522,10 @@ protected void releaseResource(Resource clusterResource, } } - @Private public boolean getReservationContinueLooking() { return reservationsContinueLooking; } - @Private public Map getACLs() { try { readLock.lock(); @@ -539,17 +535,14 @@ public boolean getReservationContinueLooking() { } } - @Private public boolean getPreemptionDisabled() { return preemptionDisabled; } - @Private public QueueCapacities getQueueCapacities() { return queueCapacities; } - @Private public ResourceUsage getQueueResourceUsage() { return queueUsage; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AppPriorityACLConfigurationParser.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AppPriorityACLConfigurationParser.java index 4489a01b69d2b299ba0db6e843596dd2132a31d7..0bf2c66db0d2f4e7d3c1b04eef66c6b2e104af69 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AppPriorityACLConfigurationParser.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AppPriorityACLConfigurationParser.java @@ -56,10 +56,8 @@ public int getId() { public static final String PATTERN_FOR_PRIORITY_ACL = "\\[([^\\]]+)"; - @Private public static final String ALL_ACL = "*"; - @Private public static final String NONE_ACL = " "; public List getPriorityAcl(Priority clusterMaxPriority, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSAssignment.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSAssignment.java index 2cae9a95080c066760b35f6676225cd333474833..d44f959be71188a116fa29de4d1663b78af1897e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSAssignment.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSAssignment.java @@ -28,8 +28,6 @@ import java.util.List; -@Private -@Unstable public class CSAssignment { public static final CSAssignment NULL_ASSIGNMENT = new CSAssignment(Resources.createResource(0, 0), NodeType.NODE_LOCAL); @@ -206,4 +204,4 @@ public NodeType getRequestLocalityType() { public void setRequestLocalityType(NodeType requestLocalityType) { this.requestLocalityType = requestLocalityType; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueue.java index 3a17d1b057d39ae2d09ad757f8e96001c87f5190..2c26b44e34703af999a84894df24a5e2257afa1c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueue.java @@ -57,8 +57,6 @@ * CSQueue represents a node in the tree of * hierarchical queues in the {@link CapacityScheduler}. */ -@Stable -@Private public interface CSQueue extends SchedulerQueue { /** * Get the parent Queue. diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java index d91aa55a4870bcb829d71f63e08bc860ae1fb075..5574879dfa0da9aa55958517e657788840cd3773 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java @@ -147,7 +147,6 @@ import com.google.common.util.concurrent.SettableFuture; @LimitedPrivate("yarn") -@Evolving @SuppressWarnings("unchecked") public class CapacityScheduler extends AbstractYarnScheduler implements diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java index 3a519ecf5f133ebfee94f6e3933ba35053cb0602..3bd1d7ba426406ae99d2df1cbd51aff97e22403b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java @@ -70,72 +70,52 @@ private static final String CS_CONFIGURATION_FILE = "capacity-scheduler.xml"; - @Private public static final String PREFIX = "yarn.scheduler.capacity."; - @Private public static final String DOT = "."; - @Private public static final String MAXIMUM_APPLICATIONS_SUFFIX = "maximum-applications"; - @Private public static final String MAXIMUM_SYSTEM_APPLICATIONS = PREFIX + MAXIMUM_APPLICATIONS_SUFFIX; - @Private public static final String MAXIMUM_AM_RESOURCE_SUFFIX = "maximum-am-resource-percent"; - @Private public static final String MAXIMUM_APPLICATION_MASTERS_RESOURCE_PERCENT = PREFIX + MAXIMUM_AM_RESOURCE_SUFFIX; - @Private public static final String QUEUES = "queues"; - @Private public static final String CAPACITY = "capacity"; - @Private public static final String MAXIMUM_CAPACITY = "maximum-capacity"; - @Private public static final String USER_LIMIT = "minimum-user-limit-percent"; - @Private public static final String USER_LIMIT_FACTOR = "user-limit-factor"; - @Private public static final String USER_WEIGHT = "weight"; - @Private public static final String USER_SETTINGS = "user-settings"; - @Private public static final float DEFAULT_USER_WEIGHT = 1.0f; - @Private public static final String STATE = "state"; - @Private public static final String ACCESSIBLE_NODE_LABELS = "accessible-node-labels"; - @Private public static final String DEFAULT_NODE_LABEL_EXPRESSION = "default-node-label-expression"; public static final String RESERVE_CONT_LOOK_ALL_NODES = PREFIX + "reservations-continue-look-all-nodes"; - @Private public static final boolean DEFAULT_RESERVE_CONT_LOOK_ALL_NODES = true; - @Private public static final String MAXIMUM_ALLOCATION_MB = "maximum-allocation-mb"; - @Private public static final String MAXIMUM_ALLOCATION_VCORES = "maximum-allocation-vcores"; @@ -154,166 +134,121 @@ public static final String DEFAULT_APP_ORDERING_POLICY = FIFO_APP_ORDERING_POLICY; - @Private public static final int DEFAULT_MAXIMUM_SYSTEM_APPLICATIIONS = 10000; - @Private public static final float DEFAULT_MAXIMUM_APPLICATIONMASTERS_RESOURCE_PERCENT = 0.1f; - @Private public static final float UNDEFINED = -1; - @Private public static final float MINIMUM_CAPACITY_VALUE = 0; - @Private public static final float MAXIMUM_CAPACITY_VALUE = 100; - @Private public static final float DEFAULT_MAXIMUM_CAPACITY_VALUE = -1.0f; - @Private public static final int DEFAULT_USER_LIMIT = 100; - @Private public static final float DEFAULT_USER_LIMIT_FACTOR = 1.0f; - @Private public static final String ALL_ACL = "*"; - @Private public static final String NONE_ACL = " "; - @Private public static final String ENABLE_USER_METRICS = + public static final String ENABLE_USER_METRICS = PREFIX +"user-metrics.enable"; - @Private public static final boolean DEFAULT_ENABLE_USER_METRICS = false; + public static final boolean DEFAULT_ENABLE_USER_METRICS = false; /** ResourceComparator for scheduling. */ - @Private public static final String RESOURCE_CALCULATOR_CLASS = + public static final String RESOURCE_CALCULATOR_CLASS = PREFIX + "resource-calculator"; - @Private public static final Class - DEFAULT_RESOURCE_CALCULATOR_CLASS = DefaultResourceCalculator.class; + public static final Class + DEFAULT_RESOURCE_CALCULATOR_CLASS = DefaultResourceCalculator.class; - @Private public static final String ROOT = "root"; - @Private public static final String NODE_LOCALITY_DELAY = PREFIX + "node-locality-delay"; - @Private public static final int DEFAULT_NODE_LOCALITY_DELAY = 40; - @Private public static final String RACK_LOCALITY_ADDITIONAL_DELAY = PREFIX + "rack-locality-additional-delay"; - @Private public static final int DEFAULT_RACK_LOCALITY_ADDITIONAL_DELAY = -1; - @Private public static final String RACK_LOCALITY_FULL_RESET = PREFIX + "rack-locality-full-reset"; - @Private public static final int DEFAULT_OFFSWITCH_PER_HEARTBEAT_LIMIT = 1; - @Private public static final String OFFSWITCH_PER_HEARTBEAT_LIMIT = PREFIX + "per-node-heartbeat.maximum-offswitch-assignments"; - @Private public static final boolean DEFAULT_RACK_LOCALITY_FULL_RESET = true; - @Private public static final String SCHEDULE_ASYNCHRONOUSLY_PREFIX = PREFIX + "schedule-asynchronously"; - @Private public static final String SCHEDULE_ASYNCHRONOUSLY_ENABLE = SCHEDULE_ASYNCHRONOUSLY_PREFIX + ".enable"; - @Private public static final String SCHEDULE_ASYNCHRONOUSLY_MAXIMUM_THREAD = SCHEDULE_ASYNCHRONOUSLY_PREFIX + ".maximum-threads"; - @Private public static final boolean DEFAULT_SCHEDULE_ASYNCHRONOUSLY_ENABLE = false; - @Private public static final String QUEUE_MAPPING = PREFIX + "queue-mappings"; - @Private public static final String ENABLE_QUEUE_MAPPING_OVERRIDE = QUEUE_MAPPING + "-override.enable"; - @Private public static final boolean DEFAULT_ENABLE_QUEUE_MAPPING_OVERRIDE = false; - @Private public static final String QUEUE_PREEMPTION_DISABLED = "disable_preemption"; - @Private public static final String DEFAULT_APPLICATION_PRIORITY = "default-application-priority"; - @Private public static final Integer DEFAULT_CONFIGURATION_APPLICATION_PRIORITY = 0; - @Private public static final String AVERAGE_CAPACITY = "average-capacity"; - @Private public static final String IS_RESERVABLE = "reservable"; - @Private public static final String RESERVATION_WINDOW = "reservation-window"; - @Private public static final String INSTANTANEOUS_MAX_CAPACITY = "instantaneous-max-capacity"; - @Private public static final String RESERVATION_ADMISSION_POLICY = "reservation-policy"; - @Private public static final String RESERVATION_AGENT_NAME = "reservation-agent"; - @Private public static final String RESERVATION_SHOW_RESERVATION_AS_QUEUE = "show-reservations-as-queues"; - @Private public static final String RESERVATION_PLANNER_NAME = "reservation-planner"; - @Private public static final String RESERVATION_MOVE_ON_EXPIRY = "reservation-move-on-expiry"; - @Private public static final String RESERVATION_ENFORCEMENT_WINDOW = "reservation-enforcement-window"; - @Private public static final String LAZY_PREEMPTION_ENALBED = PREFIX + "lazy-preemption-enabled"; - @Private public static final boolean DEFAULT_LAZY_PREEMPTION_ENABLED = false; - @Private public static final String ASSIGN_MULTIPLE_ENABLED = PREFIX + "per-node-heartbeat.multiple-assignments-enabled"; - @Private public static final boolean DEFAULT_ASSIGN_MULTIPLE_ENABLED = true; /** Maximum number of containers to assign on each check-in. */ - @Private public static final String MAX_ASSIGN_PER_HEARTBEAT = PREFIX + "per-node-heartbeat.maximum-container-assignments"; - @Private public static final int DEFAULT_MAX_ASSIGN_PER_HEARTBEAT = -1; AppPriorityACLConfigurationParser priorityACLConfig = new AppPriorityACLConfigurationParser(); @@ -514,7 +449,6 @@ public QueueState getState(String queue) { return (state == null) ? QueueState.RUNNING : state; } - @Private @VisibleForTesting public void setState(String queue, QueueState state) { set(getQueuePrefix(queue) + STATE, state.name()); @@ -782,7 +716,6 @@ public Resource getMaximumAllocation() { return Resources.createResource(maximumMemory, maximumCores); } - @Private public Priority getQueuePriority(String queue) { String queuePolicyPrefix = getQueuePrefix(queue); Priority pri = Priority.newInstance( @@ -790,7 +723,6 @@ public Priority getQueuePriority(String queue) { return pri; } - @Private public void setQueuePriority(String queue, int priority) { String queuePolicyPrefix = getQueuePrefix(queue); setInt(queuePolicyPrefix + "priority", priority); @@ -1297,7 +1229,6 @@ public boolean getLazyPreemptionEnabled() { * not defined.To be consistent with previous version the default value is set * as UNDEFINED. */ - @Private public static final String QUEUE_GLOBAL_MAX_APPLICATION = PREFIX + "global-queue-max-application"; @@ -1326,12 +1257,10 @@ public int getGlobalMaximumApplicationsPerQueue() { QUEUE_UTILIZATION_ORDERING_POLICY; - @Private public void setQueueOrderingPolicy(String queue, String policy) { set(getQueuePrefix(queue) + ORDERING_POLICY, policy); } - @Private public QueueOrderingPolicy getQueueOrderingPolicy(String queue, String parentPolicy) { String defaultPolicy = parentPolicy; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java index 48c289f0cde744927aeca10e33607e07ec533da1..39517c7915c0eda80be8c1b19a1a650460cdc36d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java @@ -58,8 +58,6 @@ * Context of the Queues in Capacity Scheduler. * */ -@Private -@Unstable public class CapacitySchedulerQueueManager implements SchedulerQueueManager< CSQueue, CapacitySchedulerConfiguration>{ @@ -448,7 +446,6 @@ public Priority getDefaultPriorityForQueue(String queueName) { return queueToLabels; } - @Private public QueueStateManager getQueueStateManager() { return this.queueStateManager; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java index f24e30aa1ee85d11c106a04b165ade0e0ecce07b..96e34250a7efd18a54e4ea64a2d8cc8fa656e306 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java @@ -81,8 +81,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Sets; -@Private -@Unstable public class LeafQueue extends AbstractCSQueue { private static final Log LOG = LogFactory.getLog(LeafQueue.class); @@ -322,7 +320,6 @@ protected void setupQueueConfigs(Resource clusterResource) /** * Used only by tests. */ - @Private public float getMinimumAllocationFactor() { return minimumAllocationFactor; } @@ -330,7 +327,6 @@ public float getMinimumAllocationFactor() { /** * Used only by tests. */ - @Private public float getMaxAMResourcePerQueuePercent() { return maxAMResourcePerQueuePercent; } @@ -409,7 +405,6 @@ public int getNumActiveApplications() { } } - @Private public int getNumPendingApplications(String user) { try { readLock.lock(); @@ -423,7 +418,6 @@ public int getNumPendingApplications(String user) { } } - @Private public int getNumActiveApplications(String user) { try { readLock.lock(); @@ -437,12 +431,10 @@ public int getNumActiveApplications(String user) { } } - @Private public int getUserLimit() { return usersManager.getUserLimit(); } - @Private public float getUserLimitFactor() { return usersManager.getUserLimitFactor(); } @@ -497,7 +489,6 @@ public User getUser(String userName) { return usersManager.getUser(userName); } - @Private public List getPriorityACLs() { try { readLock.lock(); @@ -1465,7 +1456,6 @@ public Resource getResourceLimitForAllUsers(String userName, clusterResource, nodePartition, schedulingMode); } - @Private protected boolean canAssignToUser(Resource clusterResource, String userName, Resource limit, FiCaSchedulerApp application, String nodePartition, ResourceLimits currentResourceLimits) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java index 6800b74f8d4ece6c00fa19f3511a669cc2d47a39..93f30faaad3100ccb2de6e5dbcc29f270c127914 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java @@ -69,8 +69,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.placement.PlacementSetUtils; import org.apache.hadoop.yarn.util.resource.Resources; -@Private -@Evolving public class ParentQueue extends AbstractCSQueue { private static final Log LOG = LogFactory.getLog(ParentQueue.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/UsersManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/UsersManager.java index 33f30b0041275dd0913fe129db37064040904c5d..f2028308ba0704c256eb1ae19bcf8ed1a403d471 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/UsersManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/UsersManager.java @@ -47,7 +47,6 @@ * {@link UsersManager} tracks users in the system and its respective data * structures. */ -@Private public class UsersManager implements AbstractUsersManager { private static final Log LOG = LogFactory.getLog(UsersManager.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java index a12c5ec7f68d17836211b6750d981bc509095d71..3c00f8ba34d3603baccb386c55b793f1927e04c8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java @@ -90,8 +90,6 @@ * Represents an application attempt from the viewpoint of the FIFO or Capacity * scheduler. */ -@Private -@Unstable public class FiCaSchedulerApp extends SchedulerApplicationAttempt { private static final Log LOG = LogFactory.getLog(FiCaSchedulerApp.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfigurationException.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfigurationException.java index 41292278f6bd7d90821c17b8a4c2af964137bb09..6189c92ea0ff36fb52eeaf61ae732e1e7dd15b36 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfigurationException.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfigurationException.java @@ -24,8 +24,6 @@ /** * Thrown when the allocation file for {@link QueueManager} is malformed. */ -@Private -@Unstable public class AllocationConfigurationException extends Exception { private static final long serialVersionUID = 4046517047810854249L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java index 597af9411c0190e42b4eb9a91639c91c4d2f9c80..f41cd4186038ca73d2d2747bc82824c061710836 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java @@ -59,8 +59,6 @@ import com.google.common.annotations.VisibleForTesting; -@Public -@Unstable public class AllocationFileLoaderService extends AbstractService { public static final Log LOG = LogFactory.getLog( diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/ConfigurableResource.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/ConfigurableResource.java index ecdd0111a6bcf230ed387b3ebbb10d85324d7114..805b6e7240afb5d65085920d37031c8a862e399f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/ConfigurableResource.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/ConfigurableResource.java @@ -27,8 +27,6 @@ * configure resources, such as maximum resources of a queue. It can be * percentage of cluster resources or an absolute value. */ -@Private -@Unstable public class ConfigurableResource { private final Resource resource; private final double[] percentages; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java index 30245586a0d5f318506be9bed30f67183ad60021..1d09813fb01e14ea757b7503a687446ec4ead29f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java @@ -63,8 +63,6 @@ /** * Represents an application attempt from the viewpoint of the Fair Scheduler. */ -@Private -@Unstable public class FSAppAttempt extends SchedulerApplicationAttempt implements Schedulable { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java index 60477d4e093d441acb92ad4a679580b82d3b19f9..08c4a4d48dc01619edb4d0a5992058dd8059e7ae 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java @@ -45,8 +45,6 @@ import static org.apache.hadoop.yarn.util.resource.Resources.none; -@Private -@Unstable public class FSLeafQueue extends FSQueue { private static final Log LOG = LogFactory.getLog(FSLeafQueue.class.getName()); private static final List EMPTY_LIST = Collections.emptyList(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java index e42c9f53f411a82a92b25e181fdc0bea21347514..07bc7d60952576042f4049a19d89ef0b9efdd165 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java @@ -41,8 +41,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ActiveUsersManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt; -@Private -@Unstable public class FSParentQueue extends FSQueue { private static final Log LOG = LogFactory.getLog( FSParentQueue.class.getName()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java index e0df480dbd1dadec273e58fc713e060a7da91cc6..f4086500f972eb185cc1a59f0480dcaf0c7f192f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java @@ -48,8 +48,6 @@ import com.google.common.annotations.VisibleForTesting; -@Private -@Unstable public abstract class FSQueue implements Queue, Schedulable { private static final Log LOG = LogFactory.getLog( FSQueue.class.getName()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java index 44ec9c3bc8007a6fa1e4d6a8625b05a363afc04a..b15250a2be89efffe29d2876f774eb19b549fe4f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java @@ -46,8 +46,6 @@ /** * Fair Scheduler specific node features. */ -@Private -@Unstable public class FSSchedulerNode extends SchedulerNode { private static final Log LOG = LogFactory.getLog(FSSchedulerNode.class); diff --git 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java index 37f583ec7dbd7f7d69b5159d17d92aa8509ec4bf..1b354ac0bf912aed27523365d6779ede3ad6e630 100644 --- 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java @@ -125,7 +125,6 @@ * named "parent1" would be referred to as "root.parent1.queue2". */ @LimitedPrivate("yarn") -@Unstable @SuppressWarnings("unchecked") public class FairScheduler extends AbstractYarnScheduler { diff --git 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java index 960299b70bfd3160d8f19cd3a86053d29703369c..efb6965bba698501348078ef7ef525a526ce5c5c 100644 --- 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java @@ -33,8 +33,6 @@ import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.apache.hadoop.yarn.util.resource.Resources; -@Private -@Evolving public class FairSchedulerConfiguration extends Configuration { public static final Log LOG = LogFactory.getLog( diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerEventLog.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerEventLog.java index 803ce780af53d0e9964d8f2af0026e45a96174ea..bbbbf37b838d8f5a332ff214346addae361b7ca4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerEventLog.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerEventLog.java @@ -51,8 +51,6 @@ * using {@link FairSchedulerEventLog#init(FairSchedulerConfiguration)} to * begin writing to the file. */ -@Private -@Unstable class FairSchedulerEventLog { private static final Log LOG = LogFactory.getLog(FairSchedulerEventLog.class.getName()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FifoAppComparator.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FifoAppComparator.java index 1b75740a155b39489d937b6c3fcd814e7a173568..aa11f5682aee7b05358b93e12dbcfb28b36eaf9c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FifoAppComparator.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FifoAppComparator.java @@ -28,8 +28,6 @@ * Order {@link FSAppAttempt} objects by priority and then by submit time, as * in the default scheduler in Hadoop. */ -@Private -@Unstable public class FifoAppComparator implements Comparator, Serializable { private static final long serialVersionUID = 3428835083489547918L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/InvalidQueueNameException.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/InvalidQueueNameException.java index fc5ba161e4a895d6941339f7fc3234b0f094faeb..53b3f4901d5566dd6a7c988834e84615c6175532 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/InvalidQueueNameException.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/InvalidQueueNameException.java @@ -24,8 +24,6 @@ /** * Thrown when Queue Name is malformed. */ -@Private -@Unstable public class InvalidQueueNameException extends IllegalArgumentException { private static final long serialVersionUID = -7306320927804540011L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java index 8734877f6083a98abf6c6a3eedc2b668e28623b5..54e9e749179ecb405d2e38ace23d7ff8e6fdd88e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java @@ -46,8 +46,6 @@ * Maintains a list of queues as well as scheduling parameters for each queue, * such as guaranteed share allocations, from the fair scheduler config file. */ -@Private -@Unstable public class QueueManager { public static final Log LOG = LogFactory.getLog( QueueManager.class.getName()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementPolicy.java index 30ea213529dd8298e70ec873079e3226afe8dc02..f243812223b5b6d51afa1514543986f037463ab9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementPolicy.java @@ -34,8 +34,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -@Private -@Unstable public class QueuePlacementPolicy { private static final Map> ruleClasses; static { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementRule.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementRule.java index 2c4add4e2584f8a7e02d2df46431339ccd16edb4..31454767ff901760afc0a7f7f264a97aae3a9b3e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementRule.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementRule.java @@ -36,8 +36,6 @@ import com.google.common.annotations.VisibleForTesting; -@Private -@Unstable public abstract class QueuePlacementRule { protected boolean create; public static final Log LOG = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/Schedulable.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/Schedulable.java index bd1ff7ada2581b93c28eaa466c4d3510621ef894..ead57a1576f509b70853b7da604ad472f511f3d2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/Schedulable.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/Schedulable.java @@ -42,8 +42,6 @@ * jobs and queues, which may be expensive (e.g. jobs must iterate through all * their tasks to count failed tasks, tasks that can be speculated, etc). */ -@Private -@Unstable public interface Schedulable { /** * Name of job/queue, used for debugging as well as for breaking ties in diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/SchedulingPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/SchedulingPolicy.java index 1fed9b08c551d83b0842c8338f8e01f163a1fde9..5ccb3dce264bb453763ab160bca2173b3927d88e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/SchedulingPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/SchedulingPolicy.java @@ -48,8 +48,6 @@ * schedulingPolicy in the fair scheduler configuration file. * The default policy is {@link FairSharePolicy} if not specified. */ -@Public -@Evolving public abstract class SchedulingPolicy { private static final ConcurrentHashMap, SchedulingPolicy> instances = new ConcurrentHashMap, SchedulingPolicy>(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.java index e58b3572968dda60db7770d2f3fde58e9482c438..e43651532b96334aa999e1122899f204ab2547fc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.java @@ -41,8 +41,6 @@ * A schedulable's dominant resource usage is the largest ratio of resource * usage to capacity among the resource types it is using. */ -@Private -@Unstable public class DominantResourceFairnessPolicy extends SchedulingPolicy { public static final String NAME = "DRF"; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java index 8179aa750334f155ec4488adec0fe8fd2cc74f84..e6590991d4d36119ab0ca33dbf176664e0a29604 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java @@ -39,8 +39,6 @@ /** * Makes scheduling decisions by trying to equalize shares of memory. */ -@Private -@Unstable public class FairSharePolicy extends SchedulingPolicy { @VisibleForTesting public static final String NAME = "fair"; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java index 7dd45cb9f39f519f5f35faa0c31bcbdc39cd9929..a46201002d52b68d92ed8722a21d3b0a846be686 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java @@ -35,8 +35,6 @@ import com.google.common.annotations.VisibleForTesting; -@Private -@Unstable public class FifoPolicy extends SchedulingPolicy { private static final Log LOG = LogFactory.getLog(FifoPolicy.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java index 185d426d7174d5c96e06b6e2f52b89b2aa6d9850..c6e629283726a500dd3846684f13124519609d4b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java @@ -101,7 +101,6 @@ import java.util.concurrent.ConcurrentSkipListMap; @LimitedPrivate("yarn") -@Evolving @SuppressWarnings("unchecked") public class FifoScheduler extends AbstractYarnScheduler implements diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AMRMTokenSecretManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AMRMTokenSecretManager.java index 8adb2ed1ecadb1edb4b56ef1d5e324f58bac7173..27be4bcef8c2c85b7047897050806f3dea305305 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AMRMTokenSecretManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AMRMTokenSecretManager.java @@ -135,7 +135,6 @@ public void run() { } } - @Private void rollMasterKey() { this.writeLock.lock(); try { @@ -177,7 +176,6 @@ public void activateNextMasterKey() { } } - @Private @VisibleForTesting public MasterKeyData createNewMasterKey() { this.writeLock.lock(); @@ -275,7 +273,6 @@ public AMRMTokenIdentifier createIdentifier() { return new AMRMTokenIdentifier(); } - @Private @VisibleForTesting public MasterKeyData getCurrnetMasterKeyData() { this.readLock.lock(); @@ -286,7 +283,6 @@ public MasterKeyData getCurrnetMasterKeyData() { } } - @Private @VisibleForTesting public MasterKeyData getNextMasterKeyData() { this.readLock.lock(); @@ -298,7 +294,6 @@ public MasterKeyData getNextMasterKeyData() { } @Override - @Private protected byte[] createPassword(AMRMTokenIdentifier identifier) { this.readLock.lock(); try { diff --git 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java index abb8d59ff0bf525bb0b4ffd1cf6eaa3fe3ee3b75..19306adf8a1f9e5fec0c53621864243d92419e8f 100644 --- 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java @@ -74,8 +74,6 @@ /** * Service to renew application delegation tokens. */ -@Private -@Unstable public class DelegationTokenRenewer extends AbstractService { private static final Log LOG = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/NMTokenSecretManagerInRM.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/NMTokenSecretManagerInRM.java index 956391edeea6ff31b6af404e3a6f76dfa07dfb1f..cb2b9ec896bba3aea06e06c776278e588b5467a8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/NMTokenSecretManagerInRM.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/NMTokenSecretManagerInRM.java @@ -88,7 +88,6 @@ public NMTokenSecretManagerInRM(Configuration conf) { /** * Creates a new master-key and sets it as the primary. */ - @Private public void rollMasterKey() { super.writeLock.lock(); try { @@ -107,7 +106,6 @@ public void rollMasterKey() { } } - @Private public MasterKey getNextKey() { super.readLock.lock(); try { @@ -124,7 +122,6 @@ public MasterKey getNextKey() { /** * Activate the new master-key */ - @Private public void activateNextMasterKey() { super.writeLock.lock(); try { @@ -221,7 +218,6 @@ public void registerApplicationAttempt(ApplicationAttemptId appAttemptId) { } } - @Private @VisibleForTesting public boolean isApplicationAttemptRegistered( ApplicationAttemptId appAttemptId) { @@ -233,7 +229,6 @@ public boolean isApplicationAttemptRegistered( } } - @Private @VisibleForTesting public boolean isApplicationAttemptNMTokenPresent( ApplicationAttemptId appAttemptId, NodeId nodeId) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java index 677aa14d29f7e16dbe356f65c7e749f043277957..d29de742b027bd98c2a73edc2e3438d9dedfb79c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java @@ -100,7 +100,6 @@ public void stop() { /** * Creates a new master-key and sets it as the primary. */ - @Private public void rollMasterKey() { super.writeLock.lock(); try { @@ -119,7 +118,6 @@ public void rollMasterKey() { } } - @Private public MasterKey getNextKey() { super.readLock.lock(); try { @@ -136,7 +134,6 @@ public MasterKey getNextKey() { /** * Activate the new master-key */ - @Private public void activateNextMasterKey() { super.writeLock.lock(); try { @@ -255,4 +252,4 @@ public Token createContainerToken(ContainerId containerId, return BuilderUtils.newContainerToken(nodeId, password, tokenIdentifier); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java index 53cc4716ca6c82bf1a9cf9cb5f52989f23b9e4d7..ca555d92992f37ea7ea4876cc6d862f87dd923d5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java @@ -147,7 +147,6 @@ protected void removeStoredToken(RMDelegationTokenIdentifier ident) } } - @Private @VisibleForTesting public synchronized Set getAllMasterKeys() { HashSet keySet = new HashSet(); @@ -155,7 +154,6 @@ protected void removeStoredToken(RMDelegationTokenIdentifier ident) return keySet; } - @Private @VisibleForTesting public synchronized Map getAllTokens() { Map allTokens = @@ -168,7 +166,6 @@ protected void removeStoredToken(RMDelegationTokenIdentifier ident) return allTokens; } - @Private @VisibleForTesting public int getLatestDTSequenceNumber() { return delegationTokenSequenceNumber; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/authorize/RMPolicyProvider.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/authorize/RMPolicyProvider.java index 8c5efa15e441b00f251ce37d832becaa132991fc..1bf3400d434be2c0ae403b3316f10e1a3ab8a4ce 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/authorize/RMPolicyProvider.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/authorize/RMPolicyProvider.java @@ -43,8 +43,6 @@ private RMPolicyProvider() {} - @Private - @Unstable public static RMPolicyProvider getInstance() { if (rmPolicyProvider == null) { synchronized(RMPolicyProvider.class) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServiceProtocol.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServiceProtocol.java index 062ca4c8408acfa23c6967ae9254f64f8745ee76..083d0eb0c1f634a7ccc5285c2f9de809a1199fa7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServiceProtocol.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServiceProtocol.java @@ -67,8 +67,6 @@ * * The WebService is reachable by using {@link RMWSConsts#RM_WEB_SERVICE_PATH} */ -@Private -@Evolving public interface RMWebServiceProtocol { /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java index e889de09f4455c27af491d3a8bd226a720603e9a..e201f3d2133e9e4ff61d7da41cc6dd0cd966eb9f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java @@ -72,7 +72,6 @@ import org.apache.hadoop.yarn.util.Records; import org.apache.hadoop.yarn.util.resource.Resources; -@Private public class Application { private static final Log LOG = LogFactory.getLog(Application.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java index ee974e3389f09e9acf38174c5474819d49bd8c35..e148f777dd13d29435431b5459f9af02d8c98723 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java @@ -72,7 +72,6 @@ import org.apache.hadoop.yarn.util.YarnVersionInfo; import org.apache.hadoop.yarn.util.resource.Resources; -@Private public class NodeManager implements ContainerManagementProtocol { private static final Log LOG = LogFactory.getLog(NodeManager.class); private static final RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/Router.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/Router.java index 121e5344fdb778269eca6dfa12c3d6d9e8060348..d1db82fec2169983fed4adc2202c6715b1060e92 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/Router.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/Router.java @@ -137,7 +137,6 @@ protected RouterRMAdminService createRMAdminProxyService() { return new RouterRMAdminService(); } - @Private public WebApp getWebapp() { return this.webApp; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java index cc96da62331b90a51517c0614f98ba56dd8b483b..64a00e809cd941016d6f20a54c0d5773c14024d0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java @@ -29,8 +29,6 @@ * Common utility methods used by the Router server. * */ -@Private -@Unstable public final class RouterServerUtil { /** Disable constructor. */ @@ -47,8 +45,6 @@ private RouterServerUtil() { * @param t the throwable raised in the called class. * @throws YarnException on failure */ - @Public - @Unstable public static void logAndThrowException(String errMsg, Throwable t) throws YarnException { if (t != null) { @@ -60,4 +56,4 @@ public static void logAndThrowException(String errMsg, Throwable t) } } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterClientRMService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterClientRMService.java index 73cc18558d16ed46209f0d86b4d32325b3e195a7..afd03a3ba6c9a30152e758e9cedbf8b2d4e859f8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterClientRMService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterClientRMService.java @@ -540,7 +540,6 @@ private void initializePipeline(String user) { * Private structure for encapsulating RequestInterceptor and user instances. * */ - @Private public static class RequestInterceptorChainWrapper { private ClientRequestInterceptor rootInterceptor; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RouterRMAdminService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RouterRMAdminService.java index b8b7ad818f3c4a3c98180234a2bbb471a4e8b392..bcaf19406f780dee116819e50157261cc17b9793 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RouterRMAdminService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RouterRMAdminService.java @@ -275,7 +275,6 @@ private void initializePipeline(String user) { * Private structure for encapsulating RequestInterceptor and user instances. * */ - @Private public static class RequestInterceptorChainWrapper { private RMAdminRequestInterceptor rootInterceptor; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java index bbb8326827442736bd84a26981ea6c1c51aef6d0..44bb5b5778ca819688ab864d2da8dd56bd75780d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java @@ -270,7 +270,6 @@ private void initializePipeline(String user) { * Private structure for encapsulating RequestInterceptor and user instances. * */ - @Private public static class RequestInterceptorChainWrapper { private RESTRequestInterceptor rootInterceptor; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/AppChecker.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/AppChecker.java index 4ac94106700e654029725aed0325a6ad0a3218f7..baabdb8f81fb0cf9d03576b086a3f58633dc2d31 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/AppChecker.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/AppChecker.java @@ -30,8 +30,6 @@ * An interface for checking whether an app is running so that the cleaner * service may determine if it can safely remove a cached entry. */ -@Private -@Evolving public abstract class AppChecker extends CompositeService { public AppChecker() { @@ -49,7 +47,6 @@ public AppChecker(String name) { * false otherwise * @throws YarnException if there is an error in determining the app state */ - @Private public abstract boolean isApplicationActive(ApplicationId id) throws YarnException; @@ -59,7 +56,6 @@ public abstract boolean isApplicationActive(ApplicationId id) * @return the list of active apps, or an empty list if there is none * @throws YarnException if there is an error in obtaining the list */ - @Private public abstract Collection getActiveApplications() throws YarnException; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerService.java index bcdc46b8b3d42d83c9b0ae245c71de2b684daeaf..9d6f0bb2b2c082003fd6dcaf2686db80c8693c7a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerService.java @@ -48,8 +48,6 @@ * The cleaner service that maintains the shared cache area, and cleans up stale * entries on a regular basis. */ -@Private -@Evolving public class CleanerService extends CompositeService { /** * The name of the global cleaner lock that the cleaner creates to indicate diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerTask.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerTask.java index 3e0a62b63a1d6d49895acaa9cedc409af2ec7f7c..d1e8487f597116faf44fca3f22c280bb9814c135 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerTask.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerTask.java @@ -40,8 +40,6 @@ * orphaned files. It is expected that only one cleaner task runs at any given * point in time. */ -@Private -@Evolving class CleanerTask implements Runnable { private static final String RENAMED_SUFFIX = "-renamed"; private static final Logger LOG = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/ClientProtocolService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/ClientProtocolService.java index 4275674aa471900a7e492cd0ef23d937c035ba6f..c81283fd6cc49baea32b57055acd2889db5f1836 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/ClientProtocolService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/ClientProtocolService.java @@ -50,8 +50,6 @@ * This service handles all rpc calls from the client to the shared cache * manager. */ -@Private -@Evolving public class ClientProtocolService extends AbstractService implements ClientSCMProtocol { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/RemoteAppChecker.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/RemoteAppChecker.java index 2bf3a89635579991cfae259ddbec502af633674e..1d7544fb7bb3a93c4203c7daeb69ce6e5117b600 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/RemoteAppChecker.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/RemoteAppChecker.java @@ -38,8 +38,6 @@ * An implementation of AppChecker that queries the resource manager remotely to * determine whether the app is running. */ -@Private -@Unstable public class RemoteAppChecker extends AppChecker { private static final EnumSet ACTIVE_STATES = EnumSet @@ -65,7 +63,6 @@ protected void serviceInit(Configuration conf) throws Exception { } @Override - @Private public boolean isApplicationActive(ApplicationId id) throws YarnException { ApplicationReport report = null; try { @@ -86,7 +83,6 @@ public boolean isApplicationActive(ApplicationId id) throws YarnException { } @Override - @Private public Collection getActiveApplications() throws YarnException { try { List activeApps = new ArrayList(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SCMAdminProtocolService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SCMAdminProtocolService.java index e6a885bff5ed2262ef3cf145ad9c4b35e719806f..750bcca8da8a5ee8f9bd9fa1f49771a0f889f6a2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SCMAdminProtocolService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SCMAdminProtocolService.java @@ -45,8 +45,6 @@ * This service handles all SCMAdminProtocol rpc calls from administrators * to the shared cache manager. */ -@Private -@Unstable public class SCMAdminProtocolService extends AbstractService implements SCMAdminProtocol { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheManager.java index ca683f231bd387298cbaa771d3ac4cc26b0ec564..ffc0422c0d649cb8a391af40dc792edfee6ed6c8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheManager.java @@ -43,8 +43,6 @@ * manager, and administrative commands. It also persists the shared cache meta * data to a backend store, and cleans up stale entries on a regular basis. */ -@Private -@Unstable public class SharedCacheManager extends CompositeService { /** * Priority of the SharedCacheManager shutdown hook. diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/CleanerMetrics.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/CleanerMetrics.java index 55cb074f7a05545b374fb17293453ad2602a97ed..c2c138407254c585e4efd5e044f4850899c0d60a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/CleanerMetrics.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/CleanerMetrics.java @@ -36,8 +36,6 @@ * This class is for maintaining the various Cleaner activity statistics and * publishing them through the metrics interfaces. */ -@Private -@Evolving @Metrics(name = "CleanerActivity", about = "Cleaner service metrics", context = "yarn") public class CleanerMetrics { public static final Logger LOG = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/ClientSCMMetrics.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/ClientSCMMetrics.java index 6b45745f3eef1b5ea4bf23f92341a216f55f3c61..7a275ff76702c950d32fb2584dd29bf6c28dbf0e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/ClientSCMMetrics.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/ClientSCMMetrics.java @@ -32,8 +32,6 @@ * This class is for maintaining client requests metrics * and publishing them through the metrics interfaces. */ -@Private -@Unstable @Metrics(about="Client SCM metrics", context="yarn") public class ClientSCMMetrics { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/SharedCacheUploaderMetrics.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/SharedCacheUploaderMetrics.java index 3cf6632eab21f117bdff0ea0ff6452496f257a18..4678f8ba692a3a92c46e7f7d51f07a906e69295a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/SharedCacheUploaderMetrics.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/SharedCacheUploaderMetrics.java @@ -32,8 +32,6 @@ * This class is for maintaining shared cache uploader requests metrics * and publishing them through the metrics interfaces. */ -@Private -@Evolving @Metrics(about="shared cache upload metrics", context="yarn") public class SharedCacheUploaderMetrics { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/InMemorySCMStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/InMemorySCMStore.java index d917d9b1f1ac30dfae3add692a789112853becc3..94aa81b62d6700cb519c1362c1893401a6d76a01 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/InMemorySCMStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/InMemorySCMStore.java @@ -71,8 +71,6 @@ * criteria. If a resource is not referenced (i.e. used) for a given period, it * is designated as a stale resource and is considered evictable. */ -@Private -@Evolving public class InMemorySCMStore extends SCMStore { private static final Logger LOG = LoggerFactory.getLogger(InMemorySCMStore.class); @@ -475,8 +473,6 @@ private static int getCheckPeriod(Configuration conf) { return checkMinutes; } - @Private - @Evolving class AppCheckTask implements Runnable { private final AppChecker taskAppChecker; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStore.java index 9eae556cca8b1f6cb5b59b95e4089fbebd1e30eb..fe6a2bb2697d079c7d4700e26cf92f7de82efacd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStore.java @@ -41,8 +41,6 @@ * service. All implementations of methods in this interface need to be thread * safe and atomic. */ -@Private -@Evolving public abstract class SCMStore extends CompositeService { protected AppChecker appChecker; @@ -77,7 +75,6 @@ protected void serviceInit(Configuration conf) throws Exception { * @param fileName the filename of the resource * @return the filename of the resource as represented by the cache */ - @Private public abstract String addResource(String key, String fileName); /** @@ -88,7 +85,6 @@ protected void serviceInit(Configuration conf) throws Exception { * resource existed, contained at least one * SharedCacheResourceReference and was not removed. */ - @Private public abstract boolean removeResource(String key); /** @@ -101,7 +97,6 @@ protected void serviceInit(Configuration conf) throws Exception { * SharedCacheResourceReference was added or already * existed. null if the resource did not exist */ - @Private public abstract String addResourceReference(String key, SharedCacheResourceReference ref); @@ -114,7 +109,6 @@ public abstract String addResourceReference(String key, * SharedCacheResourceReferences. If the resource does * not exist, an empty set is returned. */ - @Private public abstract Collection getResourceReferences( String key); @@ -127,7 +121,6 @@ public abstract String addResourceReference(String key, * the resource * @return true if the reference was removed, false otherwise */ - @Private public abstract boolean removeResourceReference(String key, SharedCacheResourceReference ref, boolean updateAccessTime); @@ -141,7 +134,6 @@ public abstract boolean removeResourceReference(String key, * @param updateAccessTime true if the call should update the access time for * the resource */ - @Private public abstract void removeResourceReferences(String key, Collection refs, boolean updateAccessTime); @@ -153,7 +145,6 @@ public abstract void removeResourceReferences(String key, * @param key a unique identifier for a resource * @throws YarnException */ - @Private public void cleanResourceReferences(String key) throws YarnException { Collection refs = getResourceReferences(key); if (!refs.isEmpty()) { @@ -181,7 +172,6 @@ public void cleanResourceReferences(String key) throws YarnException { * file system. * @return true if the resource is evicatble, false otherwise */ - @Private public abstract boolean isResourceEvictable(String key, FileStatus file); /** @@ -191,7 +181,6 @@ public void cleanResourceReferences(String key) throws YarnException { * @param conf * @return an instance of the AppChecker class */ - @Private @SuppressWarnings("unchecked") public static AppChecker createAppCheckerService(Configuration conf) { Class defaultCheckerClass; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResource.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResource.java index cb0df541b1d4426c79f5f6b25e2fc405b67aacff..f363bdedc1e50909a1fbe67f9efd8a7118fb2f5f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResource.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResource.java @@ -29,8 +29,6 @@ * safe. Any operation that uses the resource must use thread-safe mechanisms to * ensure safe access with the only exception of the filename. */ -@Private -@Evolving class SharedCacheResource { private long accessTime; private final Set refs; @@ -61,4 +59,4 @@ String getFileName() { boolean addReference(SharedCacheResourceReference ref) { return this.refs.add(ref); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResourceReference.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResourceReference.java index d595d9708b8fdb5c44bbd8372e0d3a002bf0aa1e..0c9660e5d863c4cb57b70df0186454886e127b4e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResourceReference.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResourceReference.java @@ -25,8 +25,6 @@ /** * This is an object that represents a reference to a shared cache resource. */ -@Private -@Evolving public class SharedCacheResourceReference { private final ApplicationId appId; private final String shortUserName; @@ -83,4 +81,4 @@ public boolean equals(Object obj) { return false; return true; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMController.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMController.java index f597d14bf4e08b419222640c2bf5d3c5e043e52c..37f89e4d97a1a71151e4c77ed5072c379e2bc798 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMController.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMController.java @@ -25,8 +25,6 @@ /** * The controller class for the shared cache manager web app. */ -@Private -@Unstable public class SCMController extends Controller { @Override public void index() { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMMetricsInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMMetricsInfo.java index 24aa1452a675f64098993f93b5b59ade0f531a7b..f2068b372aaf6f7cb016cc61e5e956e735a7d306 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMMetricsInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMMetricsInfo.java @@ -34,8 +34,6 @@ */ @XmlRootElement(name = "SCMMetrics") @XmlAccessorType(XmlAccessType.FIELD) -@Private -@Unstable public class SCMMetricsInfo { protected long totalDeletedFiles; protected long totalProcessedFiles; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMOverviewPage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMOverviewPage.java index cec085b31919f0d4f2d8069e7f32f0abe28aab83..cc2298fd98313fe92b8bda44eb8f81b0fb406374 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMOverviewPage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMOverviewPage.java @@ -39,8 +39,6 @@ /** * This class is to render the shared cache manager web ui overview page. */ -@Private -@Unstable public class SCMOverviewPage extends TwoColumnLayout { @Override protected void preHead(Page.HTML<__> html) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMWebServer.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMWebServer.java index 7984090fdce2d5d65c2a0b59fe41bdf008f4fbd9..46a30ceb8052eec35a9d71be98c9af4b14460023 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMWebServer.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMWebServer.java @@ -34,8 +34,6 @@ * {@link org.apache.hadoop.yarn.server.sharedcachemanager.SharedCacheManager} * TODO: Security for web ui (See YARN-2774) */ -@Private -@Unstable public class SCMWebServer extends AbstractService { private static final Logger LOG = LoggerFactory.getLogger(SCMWebServer.class); @@ -89,4 +87,4 @@ public void setup() { route("/", SCMController.class, "overview"); } } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/DummyAppChecker.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/DummyAppChecker.java index 2b7c72cf283507427c9361c1c18e11ef1e652819..9100fd04f70c7fd8f3712406dcfc658a5f5df240 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/DummyAppChecker.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/DummyAppChecker.java @@ -30,13 +30,11 @@ */ public class DummyAppChecker extends AppChecker { @Override - @Private public boolean isApplicationActive(ApplicationId id) throws YarnException { return false; } @Override - @Private public Collection getActiveApplications() throws YarnException { return new ArrayList(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java index f7a3d01b731128c33bba404300e413e162bdaa7a..26b273040b806ecad176a3774888a0d7d526afa7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java @@ -55,8 +55,6 @@ * This storage does not have any garbage collection mechanism, and is designed * mainly for caching usages. */ -@Private -@Unstable public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore { private static final Logger LOG = LoggerFactory.getLogger(LevelDBCacheTimelineStore.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollector.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollector.java index 38221fe98a8d480265862c86dea85d8b0c1bcb23..bd25ac4863fabf099f4d85253b879e97498b0c33 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollector.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollector.java @@ -40,8 +40,6 @@ * * App-related lifecycle management is handled by this service. */ -@Private -@Unstable public class AppLevelTimelineCollector extends TimelineCollector { private static final Logger LOG = LoggerFactory.getLogger(TimelineCollector.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollectorWithAgg.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollectorWithAgg.java index d7f47c894e3ba178dd71a2fbcce7f3562b5f6e10..abd20364859b6b3e904da996db1abb1c049e2da0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollectorWithAgg.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollectorWithAgg.java @@ -42,8 +42,6 @@ * * App-related lifecycle management is handled by this service. */ -@Private -@Unstable public class AppLevelTimelineCollectorWithAgg extends AppLevelTimelineCollector { private static final Logger LOG = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/NodeTimelineCollectorManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/NodeTimelineCollectorManager.java index 68a68f0ded5f40bbd868c83669871b694d85476e..9fe830c210f6cd888a9f708d978c9208fe8af27f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/NodeTimelineCollectorManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/NodeTimelineCollectorManager.java @@ -62,8 +62,6 @@ * Class on the NodeManager side that manages adding and removing collectors and * their lifecycle. Also instantiates the per-node collector webapp. */ -@Private -@Unstable public class NodeTimelineCollectorManager extends TimelineCollectorManager { private static final Logger LOG = LoggerFactory.getLogger(NodeTimelineCollectorManager.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/PerNodeTimelineCollectorsAuxService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/PerNodeTimelineCollectorsAuxService.java index 66f9aab034bc87ca5965c73e80d9322d0060fdb0..35f41e0960b998279f85ca2900d4a6062318869b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/PerNodeTimelineCollectorsAuxService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/PerNodeTimelineCollectorsAuxService.java @@ -49,8 +49,6 @@ * it is defined as an auxiliary service to accommodate running within another * daemon (e.g. node manager). */ -@Private -@Unstable public class PerNodeTimelineCollectorsAuxService extends AuxiliaryService { private static final Logger LOG = LoggerFactory.getLogger(PerNodeTimelineCollectorsAuxService.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollector.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollector.java index 8202431459dcc3d8ecc4b8a5e82d34a69c952755..e01b0f2c6df445101e857f3d8e9f5cb95b8baf3f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollector.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollector.java @@ -47,8 +47,6 @@ * Classes that extend this can add their own lifecycle management or * customization of request handling. */ -@Private -@Unstable public abstract class TimelineCollector extends CompositeService { private static final Logger LOG = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorWebService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorWebService.java index efb5d6bf04c8b1acf8423fa3f174c85c1a5cd308..ed7c77c822dbf15b03588a004286278df172befd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorWebService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorWebService.java @@ -64,8 +64,6 @@ * essentially a container service that routes requests to the appropriate * per-app services. */ -@Private -@Unstable @Singleton @Path("/ws/v2/timeline") public class TimelineCollectorWebService { @@ -79,8 +77,6 @@ */ @XmlRootElement(name = "about") @XmlAccessorType(XmlAccessType.NONE) - @Public - @Unstable public static class AboutInfo { private String about; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineDataToRetrieve.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineDataToRetrieve.java index 8d09c007eba558c9d37d9ff180ce648fd1ea1c0c..102468bdfc20a6f968b1f97cee593bd0db5bb464 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineDataToRetrieve.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineDataToRetrieve.java @@ -64,8 +64,6 @@ * * */ -@Private -@Unstable public class TimelineDataToRetrieve { private TimelineFilterList confsToRetrieve; private TimelineFilterList metricsToRetrieve; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineEntityFilters.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineEntityFilters.java index a415d3467cb056079bb48dd96db1e8f2ebf87f2b..f0dcf2bb8b69c6dac1f73298b71a0112fe9e67dc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineEntityFilters.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineEntityFilters.java @@ -105,8 +105,6 @@ * entity response which was sent earlier. * */ -@Private -@Unstable public final class TimelineEntityFilters { private final long limit; private long createdTimeBegin; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParser.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParser.java index 6b461a01a5cda1a505235c648a47f5768ad15f72..cdfdf1573f363b56c4452da56a1ae9f8c2687ce1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParser.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParser.java @@ -24,8 +24,6 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.server.timelineservice.reader.filter.TimelineFilterList; -@Private -@Unstable interface TimelineParser extends Closeable { /** * Method used for parsing. diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForCompareExpr.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForCompareExpr.java index 1b020d93f0c7cb0100291fe5075537c4acae9c58..110c908822660e7fb99e4a14f73c5371361a9cca 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForCompareExpr.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForCompareExpr.java @@ -54,8 +54,6 @@ * A typical compare expression would look as under: * ((key1 eq val1 OR key2 ne val2) AND (key5 gt val45)) */ -@Private -@Unstable abstract class TimelineParserForCompareExpr implements TimelineParser { private enum ParseState { PARSING_KEY, @@ -297,4 +295,4 @@ public void close() { filterList = null; currentFilter = null; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForDataToRetrieve.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForDataToRetrieve.java index 1e6039dbfd0a6bb33e58684b7a8c32d4ce2e732c..4a6674a8a5814eac3757e8614d110423fbd32666 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForDataToRetrieve.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForDataToRetrieve.java @@ -28,8 +28,6 @@ /** * Used for parsing metrics or configs to retrieve. */ -@Private -@Unstable public class TimelineParserForDataToRetrieve implements TimelineParser { private String expr; private final int exprLength; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForEqualityExpr.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForEqualityExpr.java index 74517133c6d63802a8e7ab78be61f082aaf67117..48157c9917a8c8b3f548340c563e0baf3563823d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForEqualityExpr.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForEqualityExpr.java @@ -47,8 +47,6 @@ * This means for an entity to match, event1 and event2 should exist. But event3 * and event4 should not exist. */ -@Private -@Unstable abstract class TimelineParserForEqualityExpr implements TimelineParser { private enum ParseState { PARSING_VALUE, @@ -340,4 +338,4 @@ public void close() { currentFilter = null; filterList = null; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForExistFilters.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForExistFilters.java index 8048c6eb855555d474d841c92074321238c3459e..0b897709adeb8baf5132f91c190244e014edfa91 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForExistFilters.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForExistFilters.java @@ -29,8 +29,6 @@ * check for existence of a value. For example, in case of event filters, they * check if an event exists or not and accordingly return an entity. */ -@Private -@Unstable class TimelineParserForExistFilters extends TimelineParserForEqualityExpr { public TimelineParserForExistFilters(String expression, char delimiter) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForKVFilters.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForKVFilters.java index ec68bec1b349bd19bb4d4dff666e20b4c25e408e..4c3f212f06a2362fe0cf93b732644cbc1226e601 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForKVFilters.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForKVFilters.java @@ -30,8 +30,6 @@ /** * Used for parsing key-value filters such as config and info filters. */ -@Private -@Unstable class TimelineParserForKVFilters extends TimelineParserForCompareExpr { // Indicates if value has to be interpreted as a string. private final boolean valueAsString; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForNumericFilters.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForNumericFilters.java index 7c14a9f8df0b860d7d868af5c21c5644f4d81b0b..c797bb0ce47d44884cb92e1d3bd11513c26c88fd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForNumericFilters.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForNumericFilters.java @@ -31,8 +31,6 @@ /** * Used for parsing numerical filters such as metric filters. */ -@Private -@Unstable class TimelineParserForNumericFilters extends TimelineParserForCompareExpr { public TimelineParserForNumericFilters(String expression) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForRelationFilters.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForRelationFilters.java index cde11e468a9ccd99770a6bad037a9dddd43da2ff..0c1e26c3c6c0c4bd5a7b68f9fec94307dc40fd1d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForRelationFilters.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineParserForRelationFilters.java @@ -30,8 +30,6 @@ /** * Used for parsing relation filters. */ -@Private -@Unstable class TimelineParserForRelationFilters extends TimelineParserForEqualityExpr { private final String valueDelimiter; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderContext.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderContext.java index 67c3d297e11f367c769d78296ab9d8b21ebb79af..cfe928dffd69fc8e42de10efbe5f91d83fb0aca6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderContext.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderContext.java @@ -25,8 +25,6 @@ /** * Encapsulates fields necessary to make a query in timeline reader. */ -@Private -@Unstable public class TimelineReaderContext extends TimelineContext { private String entityType; @@ -130,4 +128,4 @@ public String getDoAsUser() { public void setDoAsUser(String doAsUser) { this.doAsUser = doAsUser; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderManager.java index 67e5849ed6a925908d3e988d6a974b7f779c7b8c..e19f9c72e6bb7df5c33c3cf3148c0e25029616ec 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderManager.java @@ -37,8 +37,6 @@ * non trivial manipulation of the timeline data before or after getting * it from the backend store. */ -@Private -@Unstable public class TimelineReaderManager extends AbstractService { private TimelineReader reader; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java index 5c049eaac9027ff15191819bcfdb48985bf68f59..aaaff194509e0b112c0ddbb912e17ed7ee5d774a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java @@ -52,8 +52,6 @@ import org.slf4j.LoggerFactory; /** Main class for Timeline Reader. */ -@Private -@Unstable public class TimelineReaderServer extends CompositeService { private static final Logger LOG = LoggerFactory.getLogger(TimelineReaderServer.class); @@ -228,4 +226,4 @@ public static void main(String[] args) { TimelineReaderServer server = startTimelineReaderServer(args, conf); server.join(); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java index dfe04f9fa09d364c3795b339e980f65702203ada..e958ea152302775a805777e362031b010c31452a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java @@ -59,8 +59,6 @@ import org.slf4j.LoggerFactory; /** REST end point for Timeline Reader. */ -@Private -@Unstable @Singleton @Path("/ws/v2/timeline") public class TimelineReaderWebServices { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineCompareFilter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineCompareFilter.java index 1127f4a7f26c764093f6726fbbbbc1788d591813..53d6a342769b0fab43f3693d86ec28d93aee8e6b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineCompareFilter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineCompareFilter.java @@ -25,8 +25,6 @@ * Filter class which represents filter to be applied based on key-value pair * and the relation between them represented by different relational operators. */ -@Private -@Unstable public class TimelineCompareFilter extends TimelineFilter { private TimelineCompareOp compareOp; @@ -144,4 +142,4 @@ public String toString() { this.getClass().getSimpleName(), this.compareOp.name(), this.key, this.value, this.keyMustExist); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineCompareOp.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineCompareOp.java index 461a7d8571e399529edec830e9efdb3bf60f36ff..a7755af4ad5447764b2d44df5343739dc33ab8de 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineCompareOp.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineCompareOp.java @@ -24,8 +24,6 @@ /** * Comparison Operators. */ -@Private -@Unstable public enum TimelineCompareOp { LESS_THAN, LESS_OR_EQUAL, @@ -33,4 +31,4 @@ NOT_EQUAL, GREATER_OR_EQUAL, GREATER_THAN -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineExistsFilter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineExistsFilter.java index b4c8e25d92bf6c9e13468ce6032a3219eedc90cb..df0dc8c44efd30da44b15451ed35b35b7d20f5e4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineExistsFilter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineExistsFilter.java @@ -25,8 +25,6 @@ * Filter class which represents filter to be applied based on existence of a * value. */ -@Private -@Unstable public class TimelineExistsFilter extends TimelineFilter { private TimelineCompareOp compareOp; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineFilter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineFilter.java index 5e84976437a04b9009d34c1d3eba2950b7d20274..1d7b06352bb03d4b4c272b1a48eefe0b529ab660 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineFilter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineFilter.java @@ -24,15 +24,11 @@ /** * Abstract base class extended to implement timeline filters. */ -@Private -@Unstable public abstract class TimelineFilter { /** * Lists the different filter types. */ - @Private - @Unstable public enum TimelineFilterType { /** * Combines multiple filters. @@ -65,4 +61,4 @@ public String toString() { return this.getClass().getSimpleName(); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineFilterList.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineFilterList.java index 7d842320644be9cb062a68d94271370bedfcc758..c68b3cb02ee8a6a207caf1bb921b4c8a25deb2d9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineFilterList.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineFilterList.java @@ -32,15 +32,11 @@ * timeline filter lists as children of timeline filter lists, you can create a * hierarchy of filters to be evaluated. */ -@Private -@Unstable public class TimelineFilterList extends TimelineFilter { /** * Specifies how filters in the filter list will be evaluated. AND means all * the filters should match and OR means atleast one should match. */ - @Private - @Unstable public enum Operator { AND, OR @@ -138,4 +134,4 @@ public String toString() { return String.format("TimelineFilterList %s (%d): %s", this.operator, this.filterList.size(), this.filterList.toString()); } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineKeyValueFilter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineKeyValueFilter.java index 8bc8584dced916a0501deeb92f756ddaf5f1da4c..81bc3377ce8ecfb4bdb354c9773f35384419e2ea 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineKeyValueFilter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineKeyValueFilter.java @@ -25,8 +25,6 @@ * Filter class which represents filter to be applied based on key-value pair * being equal or not to the values in back-end store. */ -@Private -@Unstable public class TimelineKeyValueFilter extends TimelineCompareFilter { public TimelineKeyValueFilter() { } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineKeyValuesFilter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineKeyValuesFilter.java index fe4f6b2455eac9c7b3b0c94b5044ee2a94d823c7..90d934e2d76f0497ade56a8cdfa7c276832f3054 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineKeyValuesFilter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelineKeyValuesFilter.java @@ -28,8 +28,6 @@ * for a key and these values being equal or not equal to values in back-end * store. */ -@Private -@Unstable public class TimelineKeyValuesFilter extends TimelineFilter { private TimelineCompareOp compareOp; private String key; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelinePrefixFilter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelinePrefixFilter.java index bbdc96010e6fdfdcf9492cd5737d33df6144aa3b..c5bddaa49e29b110f223a3855320198e152a49e3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelinePrefixFilter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/filter/TimelinePrefixFilter.java @@ -25,8 +25,6 @@ * Filter class which represents filter to be applied based on prefixes. * Prefixes can either match or not match. */ -@Private -@Unstable public class TimelinePrefixFilter extends TimelineFilter { private TimelineCompareOp compareOp; @@ -96,4 +94,4 @@ public boolean equals(Object obj) { } return true; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/security/CollectorNodemanagerSecurityInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/security/CollectorNodemanagerSecurityInfo.java index 0eb5ee5aa5217837ce506f73caf842eebd755a7a..49942259ab27cf879ab17fd901563909409c51c9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/security/CollectorNodemanagerSecurityInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/security/CollectorNodemanagerSecurityInfo.java @@ -32,8 +32,6 @@ /** * SecurityInfo implementation for CollectorNodemanager protocol. */ -@Public -@Evolving public class CollectorNodemanagerSecurityInfo extends SecurityInfo { @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/security/TimelineV2DelegationTokenSecretManagerService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/security/TimelineV2DelegationTokenSecretManagerService.java index 1a8bf091eb5af4b0fe56d905c9f9e3fb2f1789eb..d0fb46d289dfc0d47470a87dad3d2d6c8a50d089 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/security/TimelineV2DelegationTokenSecretManagerService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/security/TimelineV2DelegationTokenSecretManagerService.java @@ -70,8 +70,6 @@ public void cancelToken(Token token, /** * Delegation token secret manager for ATSv2. */ - @Private - @Unstable public static class TimelineV2DelegationTokenSecretManager extends AbstractDelegationTokenSecretManager { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineReader.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineReader.java index 16d623ab46fa343bbe0ea8b90d8fc0b710f0b5c2..45eddf23b3cffff9106e64f8553c8ffe5295a734 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineReader.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineReader.java @@ -30,8 +30,6 @@ import org.apache.hadoop.yarn.server.timelineservice.reader.TimelineReaderContext; /** ATSv2 reader interface. */ -@Private -@Unstable public interface TimelineReader extends Service { /** @@ -192,4 +190,4 @@ TimelineEntity getEntity(TimelineReaderContext context, * storage. */ Set getEntityTypes(TimelineReaderContext context) throws IOException; -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TimelineStorageUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TimelineStorageUtils.java index 203d950fa81a30d92df236773d774f554436eb3c..d11d7e6c8757ae7048a7d87a93bdbed38265997d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TimelineStorageUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TimelineStorageUtils.java @@ -40,8 +40,6 @@ /** * A bunch of utility functions used across TimelineReader and TimelineWriter. */ -@Public -@Unstable public final class TimelineStorageUtils { private TimelineStorageUtils() { } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java index ac4afa845cdb91057849e97d4a6e9abf79ab932f..f4cd252be469ba443b3d497444042c95c8998504 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java @@ -45,7 +45,6 @@ import java.util.Map; import java.util.Set; -@Public public class AmIpFilter implements Filter { private static final Logger LOG = LoggerFactory.getLogger(AmIpFilter.class);