87
87
import org .apache .hadoop .yarn .server .resourcemanager .RMContext ;
88
88
import org .apache .hadoop .yarn .server .resourcemanager .ResourceManager ;
89
89
import org .apache .hadoop .yarn .server .resourcemanager .reservation .ReservationSystem ;
90
- import org .apache .hadoop .yarn .server .resourcemanager .reservation .ReservationSystemTestUtil ;
91
90
import org .apache .hadoop .yarn .server .resourcemanager .rmapp .RMApp ;
92
91
import org .apache .hadoop .yarn .server .resourcemanager .scheduler .ActiveUsersManager ;
93
92
import org .apache .hadoop .yarn .server .resourcemanager .scheduler .ResourceScheduler ;
139
138
import org .apache .hadoop .yarn .server .router .RouterServerUtil ;
140
139
import org .apache .hadoop .yarn .server .resourcemanager .webapp .dao .PartitionInfo ;
141
140
import org .apache .hadoop .yarn .server .resourcemanager .webapp .dao .RMQueueAclInfo ;
142
- import org .apache .hadoop .yarn .server .resourcemanager .webapp .RMWebServices ;
143
141
import org .apache .hadoop .yarn .server .scheduler .SchedulerRequestKey ;
144
142
import org .apache .hadoop .yarn .server .webapp .dao .AppAttemptInfo ;
145
143
import org .apache .hadoop .yarn .server .webapp .dao .ContainerInfo ;
@@ -177,13 +175,6 @@ public class MockDefaultRequestInterceptorREST
177
175
private Map <ApplicationId , ApplicationReport > applicationMap = new HashMap <>();
178
176
public static final String APP_STATE_RUNNING = "RUNNING" ;
179
177
180
- private static final String QUEUE_DEFAULT = "default" ;
181
- private static final String QUEUE_DEFAULT_FULL = CapacitySchedulerConfiguration .ROOT +
182
- CapacitySchedulerConfiguration .DOT + QUEUE_DEFAULT ;
183
- private static final String QUEUE_DEDICATED = "dedicated" ;
184
- public static final String QUEUE_DEDICATED_FULL = CapacitySchedulerConfiguration .ROOT +
185
- CapacitySchedulerConfiguration .DOT + QUEUE_DEDICATED ;
186
-
187
178
// duration(milliseconds), 1mins
188
179
public static final long DURATION = 60 *1000 ;
189
180
@@ -1114,7 +1105,7 @@ private MockRM setupResourceManager() throws Exception {
1114
1105
public RMQueueAclInfo checkUserAccessToQueue (String queue , String username ,
1115
1106
String queueAclType , HttpServletRequest hsr ) throws AuthorizationException {
1116
1107
1117
- ResourceManager mockRM = mock (ResourceManager .class );
1108
+ ResourceManager mockResourceManager = mock (ResourceManager .class );
1118
1109
Configuration conf = new YarnConfiguration ();
1119
1110
1120
1111
ResourceScheduler mockScheduler = new CapacityScheduler () {
@@ -1134,8 +1125,9 @@ public synchronized boolean checkAccess(UserGroupInformation callerUGI,
1134
1125
}
1135
1126
};
1136
1127
1137
- when (mockRM .getResourceScheduler ()).thenReturn (mockScheduler );
1138
- MockRMWebServices webSvc = new MockRMWebServices (mockRM , conf , mock (HttpServletResponse .class ));
1128
+ when (mockResourceManager .getResourceScheduler ()).thenReturn (mockScheduler );
1129
+ MockRMWebServices webSvc = new MockRMWebServices (mockResourceManager , conf ,
1130
+ mock (HttpServletResponse .class ));
1139
1131
return webSvc .checkUserAccessToQueue (queue , username , queueAclType , hsr );
1140
1132
}
1141
1133
0 commit comments