Repository: sentry Updated Branches: refs/heads/master 33afaefcd -> e7d633c22
SENTRY-1085: Standardize sentry generic model code's exception message. (Anne Yu, reviewed by Hao Hao). Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/e7d633c2 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/e7d633c2 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/e7d633c2 Branch: refs/heads/master Commit: e7d633c22ae5ae7187c9401f68410299a1a3c5a6 Parents: 33afaef Author: Anne Yu <[email protected]> Authored: Mon Apr 11 13:23:49 2016 -0700 Committer: Anne Yu <[email protected]> Committed: Mon Apr 11 13:51:57 2016 -0700 ---------------------------------------------------------------------- .../persistent/PrivilegeOperatePersistence.java | 4 ++-- .../service/thrift/SentryGenericPolicyProcessor.java | 14 +++++++------- .../thrift/SentryGenericServiceClientDefaultImpl.java | 6 +++--- .../appender/RollingFileWithoutDeleteAppender.java | 2 +- .../db/log/entity/DBAuditMetadataLogEntity.java | 2 ++ .../db/log/entity/GMAuditMetadataLogEntity.java | 2 ++ 6 files changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/e7d633c2/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/PrivilegeOperatePersistence.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/PrivilegeOperatePersistence.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/PrivilegeOperatePersistence.java index a86a740..c76f22e 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/PrivilegeOperatePersistence.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/PrivilegeOperatePersistence.java @@ -436,7 +436,7 @@ public class PrivilegeOperatePersistence { BitFieldActionFactory actionFactory = getActionFactory(component); BitFieldAction action = actionFactory.getActionByName(name); if (action == null) { - throw new RuntimeException("can't get BitFieldAction for name:" + name); + throw new RuntimeException("Can not get BitFieldAction for name: " + name); } return action; } @@ -448,7 +448,7 @@ public class PrivilegeOperatePersistence { } BitFieldActionFactory actionFactory = createActionFactory(caseInsensitiveComponent); actionFactories.put(caseInsensitiveComponent, actionFactory); - LOGGER.info("Action factory for component {} not found in cache. Loaded it from configuration as {}.", + LOGGER.info("Action factory for component {} is not found in cache. Loaded it from configuration as {}.", component, actionFactory.getClass().getName()); return actionFactory; } http://git-wip-us.apache.org/repos/asf/sentry/blob/e7d633c2/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java index 97c2e71..58be24d 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java @@ -150,7 +150,7 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. String Store = conf.get(PolicyStoreConstants.SENTRY_GENERIC_POLICY_STORE, PolicyStoreConstants.SENTRY_GENERIC_POLICY_STORE_DEFAULT); if (Strings.isNullOrEmpty(Store)) { - throw new SentryConfigurationException("the parameter configuration for sentry.generic.policy.store can't be empty"); + throw new SentryConfigurationException("sentry.generic.policy.store can not be empty"); } try { storeLayer = createInstance(Store, conf, SentryStoreLayer.class); @@ -415,7 +415,7 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. .createJsonLogEntity(request, tResponse, conf).toJsonFormatLog()); } catch (Exception e) { // if any exception, log the exception. - String msg = "Error creating audit log for create role: " + e.getMessage(); + String msg = "Error in creating audit log for create role: " + e.getMessage(); LOGGER.error(msg, e); } return tResponse; @@ -445,7 +445,7 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. .createJsonLogEntity(request, tResponse, conf).toJsonFormatLog()); } catch (Exception e) { // if any exception, log the exception. - String msg = "Error creating audit log for drop role: " + e.getMessage(); + String msg = "Error in creating audit log for drop role: " + e.getMessage(); LOGGER.error(msg, e); } return tResponse; @@ -473,7 +473,7 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. .createJsonLogEntity(request, tResponse, conf).toJsonFormatLog()); } catch (Exception e) { // if any exception, log the exception. - String msg = "Error creating audit log for grant privilege to role: " + e.getMessage(); + String msg = "Error in creating audit log for grant privilege to role: " + e.getMessage(); LOGGER.error(msg, e); } return tResponse; @@ -501,7 +501,7 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. .createJsonLogEntity(request, tResponse, conf).toJsonFormatLog()); } catch (Exception e) { // if any exception, log the exception. - String msg = "Error creating audit log for revoke privilege from role: " + e.getMessage(); + String msg = "Error in creating audit log for revoke privilege from role: " + e.getMessage(); LOGGER.error(msg, e); } return tResponse; @@ -531,7 +531,7 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. .createJsonLogEntity(request, tResponse, conf).toJsonFormatLog()); } catch (Exception e) { // if any exception, log the exception. - String msg = "Error creating audit log for add role to group: " + e.getMessage(); + String msg = "Error in creating audit log for add role to group: " + e.getMessage(); LOGGER.error(msg, e); } return tResponse; @@ -561,7 +561,7 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. .createJsonLogEntity(request, tResponse, conf).toJsonFormatLog()); } catch (Exception e) { // if any exception, log the exception. - String msg = "Error creating audit log for delete role from group: " + e.getMessage(); + String msg = "Error in creating audit log for delete role from group: " + e.getMessage(); LOGGER.error(msg, e); } return tResponse; http://git-wip-us.apache.org/repos/asf/sentry/blob/e7d633c2/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericServiceClientDefaultImpl.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericServiceClientDefaultImpl.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericServiceClientDefaultImpl.java index e52b6ef..dce3dad 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericServiceClientDefaultImpl.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericServiceClientDefaultImpl.java @@ -104,10 +104,10 @@ public class SentryGenericServiceClientDefaultImpl implements SentryGenericServi } }); } catch (IOException e) { - throw new TTransportException("Failed to open SASL transport", e); + throw new TTransportException("Failed to open SASL transport: " + e.getMessage(), e); } catch (InterruptedException e) { throw new TTransportException( - "Interrupted while opening underlying transport", e); + "Interrupted while opening underlying transport: " + e.getMessage(), e); } } } @@ -386,7 +386,7 @@ public class SentryGenericServiceClientDefaultImpl implements SentryGenericServi List<? extends Authorizable> newAuthorizables) throws SentryUserException { if (oldAuthorizables == null || oldAuthorizables.isEmpty() || newAuthorizables == null || newAuthorizables.isEmpty()) { - throw new SentryUserException("oldAuthorizables and newAuthorizables can't be null or empty"); + throw new SentryUserException("oldAuthorizables or newAuthorizables can not be null or empty"); } TRenamePrivilegesRequest request = new TRenamePrivilegesRequest(); http://git-wip-us.apache.org/repos/asf/sentry/blob/e7d633c2/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/appender/RollingFileWithoutDeleteAppender.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/appender/RollingFileWithoutDeleteAppender.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/appender/RollingFileWithoutDeleteAppender.java index b8dafc8..fd133f3 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/appender/RollingFileWithoutDeleteAppender.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/appender/RollingFileWithoutDeleteAppender.java @@ -108,7 +108,7 @@ public class RollingFileWithoutDeleteAppender extends FileAppender { if (e instanceof InterruptedIOException) { Thread.currentThread().interrupt(); } - LogLog.error("setFile(" + newFileName + ", false) call failed.", e); + LogLog.error("setFile(" + newFileName + ", false) call failed: " + e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/sentry/blob/e7d633c2/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/DBAuditMetadataLogEntity.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/DBAuditMetadataLogEntity.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/DBAuditMetadataLogEntity.java index 95afe52..2381326 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/DBAuditMetadataLogEntity.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/DBAuditMetadataLogEntity.java @@ -113,6 +113,8 @@ public class DBAuditMetadataLogEntity extends AuditMetadataLogEntity { json.close(); } } catch (IOException e) { + String msg = "Error when close json object: " + e.getMessage(); + LOGGER.error(msg, e); throw e; } } http://git-wip-us.apache.org/repos/asf/sentry/blob/e7d633c2/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/GMAuditMetadataLogEntity.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/GMAuditMetadataLogEntity.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/GMAuditMetadataLogEntity.java index 25d55e0..4db91f3 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/GMAuditMetadataLogEntity.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/log/entity/GMAuditMetadataLogEntity.java @@ -77,6 +77,8 @@ public class GMAuditMetadataLogEntity extends AuditMetadataLogEntity { json.close(); } } catch (IOException e) { + String msg = "Error when close json object: " + e.getMessage(); + LOGGER.error(msg, e); throw e; } }
