From fb804f0900e4424ebb7a1300ffc9ee04c828a2b5 Mon Sep 17 00:00:00 2001 From: Ethan Rose Date: Wed, 17 Aug 2022 15:43:49 -0700 Subject: [PATCH 1/2] Log correctly when status is null --- ...ngerClientMultiTenantAccessController.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/RangerClientMultiTenantAccessController.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/RangerClientMultiTenantAccessController.java index cb0af7831d0..38b1e3749ff 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/RangerClientMultiTenantAccessController.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/RangerClientMultiTenantAccessController.java @@ -35,6 +35,7 @@ import java.util.stream.Collectors; import com.google.common.base.Preconditions; +import com.sun.jersey.api.client.ClientResponse; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.OmUtils; import org.apache.hadoop.ozone.OzoneConsts; @@ -148,17 +149,21 @@ public RangerClientMultiTenantAccessController(OzoneConfiguration conf) * @param rse RangerServiceException */ private void decodeRSEStatusCodes(RangerServiceException rse) { - - switch (rse.getStatus().getStatusCode()) { - case HTTP_STATUS_CODE_UNAUTHORIZED: - LOG.error("Auth failure. Please double check Ranger-related configs"); - break; - case HTTP_STATUS_CODE_BAD_REQUEST: - LOG.error("Request failure. If this is an assign-user operation, " - + "check if the user name exists in Ranger."); - break; - default: - LOG.error("Other request failure: {}", rse.getStatus()); + ClientResponse.Status status = rse.getStatus(); + if (status == null) { + LOG.error("Request failure with no status provided.", rse); + } else { + switch (status.getStatusCode()) { + case HTTP_STATUS_CODE_UNAUTHORIZED: + LOG.error("Auth failure. Please double check Ranger-related configs"); + break; + case HTTP_STATUS_CODE_BAD_REQUEST: + LOG.error("Request failure. If this is an assign-user operation, " + + "check if the user name exists in Ranger."); + break; + default: + LOG.error("Other request failure. Status: {}", status); + } } } From e1e9bb9416aec4881e2a396ae92471eb55fc7b67 Mon Sep 17 00:00:00 2001 From: Ethan Rose Date: Wed, 17 Aug 2022 15:57:03 -0700 Subject: [PATCH 2/2] checkstyle --- ...angerClientMultiTenantAccessController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/RangerClientMultiTenantAccessController.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/RangerClientMultiTenantAccessController.java index 38b1e3749ff..4aae4d9a77e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/RangerClientMultiTenantAccessController.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/RangerClientMultiTenantAccessController.java @@ -154,15 +154,15 @@ private void decodeRSEStatusCodes(RangerServiceException rse) { LOG.error("Request failure with no status provided.", rse); } else { switch (status.getStatusCode()) { - case HTTP_STATUS_CODE_UNAUTHORIZED: - LOG.error("Auth failure. Please double check Ranger-related configs"); - break; - case HTTP_STATUS_CODE_BAD_REQUEST: - LOG.error("Request failure. If this is an assign-user operation, " - + "check if the user name exists in Ranger."); - break; - default: - LOG.error("Other request failure. Status: {}", status); + case HTTP_STATUS_CODE_UNAUTHORIZED: + LOG.error("Auth failure. Please double check Ranger-related configs"); + break; + case HTTP_STATUS_CODE_BAD_REQUEST: + LOG.error("Request failure. If this is an assign-user operation, " + + "check if the user name exists in Ranger."); + break; + default: + LOG.error("Other request failure. Status: {}", status); } } }