|
@@ -28,7 +28,7 @@ import java.util.Set;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
|
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
|
-import org.apache.hadoop.classification.InterfaceStability.Stable;
|
|
|
|
|
|
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
|
|
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
|
|
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
|
|
import org.apache.hadoop.yarn.api.records.ApplicationId;
|
|
import org.apache.hadoop.yarn.api.records.ApplicationId;
|
|
import org.apache.hadoop.yarn.api.records.Container;
|
|
import org.apache.hadoop.yarn.api.records.Container;
|
|
@@ -58,9 +58,12 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType;
|
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Queue;
|
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Queue;
|
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplication;
|
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplication;
|
|
|
|
|
|
|
|
+import com.google.common.annotations.VisibleForTesting;
|
|
import com.google.common.collect.HashMultiset;
|
|
import com.google.common.collect.HashMultiset;
|
|
import com.google.common.collect.Multiset;
|
|
import com.google.common.collect.Multiset;
|
|
|
|
|
|
|
|
+@Private
|
|
|
|
+@Unstable
|
|
public class FSSchedulerApp extends SchedulerApplication {
|
|
public class FSSchedulerApp extends SchedulerApplication {
|
|
|
|
|
|
private static final Log LOG = LogFactory.getLog(FSSchedulerApp.class);
|
|
private static final Log LOG = LogFactory.getLog(FSSchedulerApp.class);
|
|
@@ -312,8 +315,7 @@ public class FSSchedulerApp extends SchedulerApplication {
|
|
* Used only by unit tests
|
|
* Used only by unit tests
|
|
* @return total current reservations
|
|
* @return total current reservations
|
|
*/
|
|
*/
|
|
- @Stable
|
|
|
|
- @Private
|
|
|
|
|
|
+ @VisibleForTesting
|
|
public synchronized Resource getCurrentReservation() {
|
|
public synchronized Resource getCurrentReservation() {
|
|
return currentReservation;
|
|
return currentReservation;
|
|
}
|
|
}
|