YARN-6379. Remove unused argument in ClientRMService. Contributed by Kai Sasaki.

(cherry picked from commit b63ae854f9)
This commit is contained in:
Akira Ajisaka 2017-03-27 11:23:41 +09:00
parent f51ee482a7
commit e4320305d3
1 changed files with 7 additions and 6 deletions

View File

@ -1155,7 +1155,7 @@ public class ClientRMService extends AbstractService implements
@Override @Override
public GetNewReservationResponse getNewReservation( public GetNewReservationResponse getNewReservation(
GetNewReservationRequest request) throws YarnException, IOException { GetNewReservationRequest request) throws YarnException, IOException {
checkReservationSystem(AuditConstants.CREATE_NEW_RESERVATION_REQUEST); checkReservationSystem();
GetNewReservationResponse response = GetNewReservationResponse response =
recordFactory.newRecordInstance(GetNewReservationResponse.class); recordFactory.newRecordInstance(GetNewReservationResponse.class);
@ -1169,7 +1169,7 @@ public class ClientRMService extends AbstractService implements
public ReservationSubmissionResponse submitReservation( public ReservationSubmissionResponse submitReservation(
ReservationSubmissionRequest request) throws YarnException, IOException { ReservationSubmissionRequest request) throws YarnException, IOException {
// Check if reservation system is enabled // Check if reservation system is enabled
checkReservationSystem(AuditConstants.SUBMIT_RESERVATION_REQUEST); checkReservationSystem();
ReservationSubmissionResponse response = ReservationSubmissionResponse response =
recordFactory.newRecordInstance(ReservationSubmissionResponse.class); recordFactory.newRecordInstance(ReservationSubmissionResponse.class);
ReservationId reservationId = request.getReservationId(); ReservationId reservationId = request.getReservationId();
@ -1228,7 +1228,7 @@ public class ClientRMService extends AbstractService implements
public ReservationUpdateResponse updateReservation( public ReservationUpdateResponse updateReservation(
ReservationUpdateRequest request) throws YarnException, IOException { ReservationUpdateRequest request) throws YarnException, IOException {
// Check if reservation system is enabled // Check if reservation system is enabled
checkReservationSystem(AuditConstants.UPDATE_RESERVATION_REQUEST); checkReservationSystem();
ReservationUpdateResponse response = ReservationUpdateResponse response =
recordFactory.newRecordInstance(ReservationUpdateResponse.class); recordFactory.newRecordInstance(ReservationUpdateResponse.class);
// Validate the input // Validate the input
@ -1267,7 +1267,7 @@ public class ClientRMService extends AbstractService implements
public ReservationDeleteResponse deleteReservation( public ReservationDeleteResponse deleteReservation(
ReservationDeleteRequest request) throws YarnException, IOException { ReservationDeleteRequest request) throws YarnException, IOException {
// Check if reservation system is enabled // Check if reservation system is enabled
checkReservationSystem(AuditConstants.DELETE_RESERVATION_REQUEST); checkReservationSystem();
ReservationDeleteResponse response = ReservationDeleteResponse response =
recordFactory.newRecordInstance(ReservationDeleteResponse.class); recordFactory.newRecordInstance(ReservationDeleteResponse.class);
// Validate the input // Validate the input
@ -1306,7 +1306,7 @@ public class ClientRMService extends AbstractService implements
public ReservationListResponse listReservations( public ReservationListResponse listReservations(
ReservationListRequest requestInfo) throws YarnException, IOException { ReservationListRequest requestInfo) throws YarnException, IOException {
// Check if reservation system is enabled // Check if reservation system is enabled
checkReservationSystem(AuditConstants.LIST_RESERVATION_REQUEST); checkReservationSystem();
ReservationListResponse response = ReservationListResponse response =
recordFactory.newRecordInstance(ReservationListResponse.class); recordFactory.newRecordInstance(ReservationListResponse.class);
@ -1381,7 +1381,8 @@ public class ClientRMService extends AbstractService implements
return response; return response;
} }
private void checkReservationSystem(String auditConstant) throws YarnException { private void checkReservationSystem()
throws YarnException {
// Check if reservation is enabled // Check if reservation is enabled
if (reservationSystem == null) { if (reservationSystem == null) {
throw RPCUtil.getRemoteException("Reservation is not enabled." throw RPCUtil.getRemoteException("Reservation is not enabled."