This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 3f019042aa [Minor] Improve log messages (#6531)
3f019042aa is described below
commit 3f019042aa9ae67f7fe36780d699d7b91f486b7a
Author: Justin Mclean <[email protected]>
AuthorDate: Wed Mar 12 19:42:43 2025 +0800
[Minor] Improve log messages (#6531)
### What changes were proposed in this pull request?
Improve a couple of log messages.
### Why are the changes needed?
For clarity.
Fix: #(issue)
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
N/A
---
.../ranger/RangerAuthorizationHDFSPlugin.java | 17 +++++++------
.../ranger/RangerAuthorizationHadoopSQLPlugin.java | 28 ++++++++++------------
.../gravitino/authorization/OwnerManager.java | 2 +-
3 files changed, 22 insertions(+), 25 deletions(-)
diff --git
a/authorizations/authorization-ranger/src/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHDFSPlugin.java
b/authorizations/authorization-ranger/src/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHDFSPlugin.java
index 1807484061..e5c8434970 100644
---
a/authorizations/authorization-ranger/src/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHDFSPlugin.java
+++
b/authorizations/authorization-ranger/src/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHDFSPlugin.java
@@ -169,7 +169,7 @@ public class RangerAuthorizationHDFSPlugin extends
RangerAuthorizationPlugin {
try {
return rangerClient.findPolicies(searchFilters);
} catch (RangerServiceException e) {
- throw new AuthorizationPluginException(e, "Failed to find the policies
in the Ranger");
+ throw new AuthorizationPluginException(e, "Failed to find policies in
Ranger");
}
}
@@ -279,10 +279,9 @@ public class RangerAuthorizationHDFSPlugin extends
RangerAuthorizationPlugin {
authzMetadataObject instanceof PathBasedMetadataObject,
"The metadata object must be a PathBasedMetadataObject");
Preconditions.checkArgument(
- authzMetadataObject.type() == SCHEMA, "The metadata object type must
be SCHEMA");
+ authzMetadataObject.type() == SCHEMA, "The metadata object type must
be a schema");
Preconditions.checkArgument(
- authzMetadataObject.names().size() == 1,
- "The size of the metadata object's name must be 1.");
+ authzMetadataObject.names().size() == 1, "The metadata object's size
must be 1.");
if (RangerHelper.RESOURCE_ALL.equals(authzMetadataObject.name())) {
// Remove all schema in this catalog
String catalogName = authzMetadataObject.names().get(0);
@@ -362,9 +361,9 @@ public class RangerAuthorizationHDFSPlugin extends
RangerAuthorizationPlugin {
authzMetadataObject instanceof PathBasedMetadataObject,
"The metadata object must be a PathBasedMetadataObject");
Preconditions.checkArgument(
- authzMetadataObject.names().size() == 3, "The metadata object names
must be 3");
+ authzMetadataObject.names().size() == 3, "The metadata object's name
size must be 3");
Preconditions.checkArgument(
- authzMetadataObject.type() == PATH, "The metadata object type must be
PATH");
+ authzMetadataObject.type() == PATH, "The metadata object type must be
a path");
removePolicyByMetadataObject(authzMetadataObject);
}
@@ -626,7 +625,7 @@ public class RangerAuthorizationHDFSPlugin extends
RangerAuthorizationPlugin {
((MetadataObjectChange.RenameMetadataObject)
change).newMetadataObject();
Preconditions.checkArgument(
metadataObject.type() == newMetadataObject.type(),
- "The old and new metadata object type must be equal!");
+ "The old and new metadata object types must be equal!");
if (metadataObject.type() == MetadataObject.Type.METALAKE) {
// Rename the metalake name
this.metalake = newMetadataObject.name();
@@ -642,13 +641,13 @@ public class RangerAuthorizationHDFSPlugin extends
RangerAuthorizationPlugin {
translateMetadataObject(newMetadataObject);
Preconditions.checkArgument(
oldAuthzMetadataObjects.size() == newAuthzMetadataObjects.size(),
- "The old and new metadata objects size must be equal!");
+ "The old and new metadata objects sizes must be equal!");
for (int i = 0; i < oldAuthzMetadataObjects.size(); i++) {
AuthorizationMetadataObject oldAuthMetadataObject =
oldAuthzMetadataObjects.get(i);
AuthorizationMetadataObject newAuthzMetadataObject =
newAuthzMetadataObjects.get(i);
if (oldAuthMetadataObject.equals(newAuthzMetadataObject)) {
LOG.info(
- "The metadata object({}) and new metadata object({}) are
equal, so ignore rename!",
+ "The metadata object({}) and new metadata object({}) are
equal, so ignoring rename!",
oldAuthMetadataObject.fullName(),
newAuthzMetadataObject.fullName());
continue;
diff --git
a/authorizations/authorization-ranger/src/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHadoopSQLPlugin.java
b/authorizations/authorization-ranger/src/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHadoopSQLPlugin.java
index b4f8c14c86..bef0562f19 100644
---
a/authorizations/authorization-ranger/src/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHadoopSQLPlugin.java
+++
b/authorizations/authorization-ranger/src/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHadoopSQLPlugin.java
@@ -121,7 +121,7 @@ public class RangerAuthorizationHadoopSQLPlugin extends
RangerAuthorizationPlugi
try {
return rangerClient.findPolicies(searchFilters);
} catch (RangerServiceException e) {
- throw new AuthorizationPluginException(e, "Failed to find the policies
in the Ranger");
+ throw new AuthorizationPluginException(e, "Failed to find policies in
Ranger");
}
}
@@ -229,7 +229,7 @@ public class RangerAuthorizationHadoopSQLPlugin extends
RangerAuthorizationPlugi
AuthorizationSecurableObject.DOT_SPLITTER.splitToList(policyName));
Preconditions.checkArgument(
policyNames.size() >= oldAuthzMetaObject.names().size(),
- String.format("The policy name(%s) is invalid!",
policyName));
+ String.format("The policy name (%s) is invalid!",
policyName));
if
(policyNames.get(index).equals(RangerHelper.RESOURCE_ALL)) {
// Doesn't need to rename the policy `*`
return;
@@ -253,7 +253,7 @@ public class RangerAuthorizationHadoopSQLPlugin extends
RangerAuthorizationPlugi
||
existNewPolicy.getResources().equals(policy.getResources()));
if (alreadyExist) {
LOG.warn(
- "The Ranger policy for the metadata object({}) already
exists!",
+ "The Ranger policy for the metadata object ({}) already
exists!",
newAuthzMetaObject);
return;
}
@@ -295,9 +295,9 @@ public class RangerAuthorizationHadoopSQLPlugin extends
RangerAuthorizationPlugi
*/
private void doRemoveSchemaMetadataObject(AuthorizationMetadataObject
authzMetadataObject) {
Preconditions.checkArgument(
- authzMetadataObject.type() == SCHEMA, "The metadata object type must
be SCHEMA");
+ authzMetadataObject.type() == SCHEMA, "The metadata object type must
be a schema");
Preconditions.checkArgument(
- authzMetadataObject.names().size() == 1, "The metadata object names
must be 1");
+ authzMetadataObject.names().size() == 1, "The metadata object's name
size must be 1");
if (RangerHelper.RESOURCE_ALL.equals(authzMetadataObject.name())) {
// Delete metalake or catalog policies in this Ranger service
try {
@@ -700,16 +700,14 @@ public class RangerAuthorizationHadoopSQLPlugin extends
RangerAuthorizationPlugi
break;
default:
LOG.warn(
- "RangerAuthorizationHivePlugin -> privilege {} is
not supported for the securable object: {}",
- gravitinoPrivilege.name(),
- securableObject.type());
+ "The privilege %s is not supported for the securable
object: %s",
+ gravitinoPrivilege.name(), securableObject.type());
}
break;
default:
LOG.warn(
- "RangerAuthorizationHivePlugin -> privilege {} is not
supported for the securable object: {}",
- gravitinoPrivilege.name(),
- securableObject.type());
+ "The privilege %s is not supported for the securable
object: %s",
+ gravitinoPrivilege.name(), securableObject.type());
}
});
@@ -724,7 +722,7 @@ public class RangerAuthorizationHadoopSQLPlugin extends
RangerAuthorizationPlugi
public List<AuthorizationMetadataObject>
translateMetadataObject(MetadataObject metadataObject) {
Preconditions.checkArgument(
!(metadataObject instanceof RangerPrivileges),
- "The metadata object must be not a RangerPrivileges object.");
+ "The metadata object must not be a RangerPrivileges object.");
List<String> nsMetadataObject =
Lists.newArrayList(SecurableObjects.DOT_SPLITTER.splitToList(metadataObject.fullName()));
Preconditions.checkArgument(
@@ -760,7 +758,7 @@ public class RangerAuthorizationHadoopSQLPlugin extends
RangerAuthorizationPlugi
((MetadataObjectChange.RenameMetadataObject)
change).newMetadataObject();
Preconditions.checkArgument(
metadataObject.type() == newMetadataObject.type(),
- "The old and new metadata object type must be equal!");
+ "The old and new metadata object types must be equal!");
if (metadataObject.type() == MetadataObject.Type.METALAKE) {
// Rename the metalake name
this.metalake = newMetadataObject.name();
@@ -776,13 +774,13 @@ public class RangerAuthorizationHadoopSQLPlugin extends
RangerAuthorizationPlugi
translateMetadataObject(newMetadataObject);
Preconditions.checkArgument(
oldAuthzMetadataObjects.size() == newAuthzMetadataObjects.size(),
- "The old and new metadata objects size must be equal!");
+ "The old and new metadata objects sizes must be equal!");
for (int i = 0; i < oldAuthzMetadataObjects.size(); i++) {
AuthorizationMetadataObject oldAuthMetadataObject =
oldAuthzMetadataObjects.get(i);
AuthorizationMetadataObject newAuthzMetadataObject =
newAuthzMetadataObjects.get(i);
if (oldAuthMetadataObject.equals(newAuthzMetadataObject)) {
LOG.info(
- "The metadata object({}) and new metadata object({}) are
equal, so ignore rename!",
+ "The metadata object({}) and new metadata object({}) are
equal, so ignoring rename!",
oldAuthMetadataObject.fullName(),
newAuthzMetadataObject.fullName());
continue;
diff --git
a/core/src/main/java/org/apache/gravitino/authorization/OwnerManager.java
b/core/src/main/java/org/apache/gravitino/authorization/OwnerManager.java
index b6c44f4ac3..2847bbabe3 100644
--- a/core/src/main/java/org/apache/gravitino/authorization/OwnerManager.java
+++ b/core/src/main/java/org/apache/gravitino/authorization/OwnerManager.java
@@ -150,7 +150,7 @@ public class OwnerManager {
if (entities.size() != 1) {
throw new IllegalStateException(
- String.format("The number of the owner %s must be 1",
metadataObject.fullName()));
+ String.format("The size of the owner's name %s must be 1",
metadataObject.fullName()));
}
Entity entity = entities.get(0);
