Repository: sentry Updated Branches: refs/heads/master 5eae90ea9 -> ebb94b189
SENTRY-1897: Rename sentry property to provide the list of sentry servers (Vamsee Yarlagadda, Reviewed by: Na Li, Alexander Kolbasov) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/ebb94b18 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/ebb94b18 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/ebb94b18 Branch: refs/heads/master Commit: ebb94b1897e74fd4ce98b848845b441da6f99672 Parents: 5eae90e Author: Vamsee Yarlagadda <[email protected]> Authored: Mon Jul 17 16:39:52 2017 -0800 Committer: Vamsee Yarlagadda <[email protected]> Committed: Tue Aug 22 18:21:27 2017 -0400 ---------------------------------------------------------------------- conf/sentry-site.xml.hive-client.example | 2 +- conf/sentry-site.xml.hive-client.template | 2 +- .../core/common/transport/SentryClientTransportConstants.java | 4 ++-- .../src/main/java/org/apache/sentry/hdfs/ServiceConstants.java | 2 +- .../org/apache/sentry/service/thrift/ServiceConstants.java | 2 +- .../org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java | 6 +++--- .../apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/ebb94b18/conf/sentry-site.xml.hive-client.example ---------------------------------------------------------------------- diff --git a/conf/sentry-site.xml.hive-client.example b/conf/sentry-site.xml.hive-client.example index c9f1d05..64b1b7d 100644 --- a/conf/sentry-site.xml.hive-client.example +++ b/conf/sentry-site.xml.hive-client.example @@ -35,7 +35,7 @@ <value>8038</value> </property> <property> - <name>sentry.service.client.server.rpc-address</name> + <name>sentry.service.client.server.rpc-addresses</name> <value>localhost</value> </property> <property> http://git-wip-us.apache.org/repos/asf/sentry/blob/ebb94b18/conf/sentry-site.xml.hive-client.template ---------------------------------------------------------------------- diff --git a/conf/sentry-site.xml.hive-client.template b/conf/sentry-site.xml.hive-client.template index becff9c..4703470 100644 --- a/conf/sentry-site.xml.hive-client.template +++ b/conf/sentry-site.xml.hive-client.template @@ -37,7 +37,7 @@ <property> - <name>sentry.service.client.server.rpc-address</name> + <name>sentry.service.client.server.rpc-addresses</name> <value> </value> <description> TCP address of the sentry store server</description> </property> http://git-wip-us.apache.org/repos/asf/sentry/blob/ebb94b18/sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/transport/SentryClientTransportConstants.java ---------------------------------------------------------------------- diff --git a/sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/transport/SentryClientTransportConstants.java b/sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/transport/SentryClientTransportConstants.java index fd07887..358d282 100644 --- a/sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/transport/SentryClientTransportConstants.java +++ b/sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/transport/SentryClientTransportConstants.java @@ -67,7 +67,7 @@ public final class SentryClientTransportConstants { static final String SERVER_RPC_PORT = "sentry.service.client.server.rpc-port"; //configuration for server address. It can be coma seperated list of server addresses. - static final String SERVER_RPC_ADDRESS = "sentry.service.client.server.rpc-address"; + static final String SERVER_RPC_ADDRESS = "sentry.service.client.server.rpc-addresses"; /** * This configuration parameter is only meant to be used for testing purposes. @@ -140,7 +140,7 @@ public final class SentryClientTransportConstants { static final String SERVER_RPC_PORT = "sentry.hdfs.service.client.server.rpc-port"; //configuration for server address. It can be coma seperated list of server addresses. - static final String SERVER_RPC_ADDRESS = "sentry.hdfs.service.client.server.rpc-address"; + static final String SERVER_RPC_ADDRESS = "sentry.hdfs.service.client.server.rpc-addresses"; /** * This configuration parameter is only meant to be used for testing purposes. http://git-wip-us.apache.org/repos/asf/sentry/blob/ebb94b18/sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/ServiceConstants.java ---------------------------------------------------------------------- diff --git a/sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/ServiceConstants.java b/sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/ServiceConstants.java index f993010..55092ee 100644 --- a/sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/ServiceConstants.java +++ b/sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/ServiceConstants.java @@ -73,7 +73,7 @@ public class ServiceConstants { public static final String SERVER_RPC_PORT = "sentry.hdfs.service.client.server.rpc-port"; - public static final String SERVER_RPC_ADDRESS = "sentry.hdfs.service.client.server.rpc-address"; + public static final String SERVER_RPC_ADDRESS = "sentry.hdfs.service.client.server.rpc-addresses"; public static final String USE_COMPACT_TRANSPORT = "sentry.hdfs.service.client.compact.transport"; public static final boolean USE_COMPACT_TRANSPORT_DEFAULT = false; http://git-wip-us.apache.org/repos/asf/sentry/blob/ebb94b18/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java index 5b6ef53..48aec1e 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java @@ -241,7 +241,7 @@ public class ServiceConstants { public static class ClientConfig { public static final String SERVER_RPC_PORT = "sentry.service.client.server.rpc-port"; public static final int SERVER_RPC_PORT_DEFAULT = ServerConfig.RPC_PORT_DEFAULT; - public static final String SERVER_RPC_ADDRESS = "sentry.service.client.server.rpc-address"; + public static final String SERVER_RPC_ADDRESS = "sentry.service.client.server.rpc-addresses"; public static final String SERVER_RPC_CONN_TIMEOUT = "sentry.service.client.server.rpc-connection-timeout"; // HA configuration http://git-wip-us.apache.org/repos/asf/sentry/blob/ebb94b18/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java b/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java index c19ccbd..acf1cf5 100644 --- a/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java +++ b/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java @@ -329,7 +329,7 @@ public class TestHDFSIntegration { hadoopConf.set("sentry.authorization-provider.cache-stale-threshold.ms", String.valueOf(STALE_THRESHOLD)); hadoopConf.set("sentry.hdfs.service.security.mode", "none"); - hadoopConf.set("sentry.hdfs.service.client.server.rpc-address", "localhost"); + hadoopConf.set("sentry.hdfs.service.client.server.rpc-addresses", "localhost"); hadoopConf.set("sentry.hdfs.service.client.server.rpc-port", String.valueOf(sentryPort)); EditLogFileOutputStream.setShouldSkipFsyncForTesting(true); miniDFS = new MiniDFSCluster.Builder(hadoopConf).build(); @@ -487,8 +487,8 @@ public class TestHDFSIntegration { public Void run() throws Exception { HiveConf hiveConf = hiveConfiguration; hiveConf.set("sentry.metastore.plugins", "org.apache.sentry.hdfs.MetastorePlugin"); - hiveConf.set("sentry.service.client.server.rpc-address", "localhost"); - hiveConf.set("sentry.hdfs.service.client.server.rpc-address", "localhost"); + hiveConf.set("sentry.service.client.server.rpc-addresses", "localhost"); + hiveConf.set("sentry.hdfs.service.client.server.rpc-addresses", "localhost"); hiveConf.set("sentry.hdfs.service.client.server.rpc-port", String.valueOf(sentryPort)); hiveConf.set("sentry.service.client.server.rpc-port", String.valueOf(sentryPort)); // hiveConf.set("sentry.service.server.compact.transport", "true"); http://git-wip-us.apache.org/repos/asf/sentry/blob/ebb94b18/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java index e62c54a..63e718c 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java @@ -526,8 +526,8 @@ public abstract class TestHDFSIntegrationBase { public Void run() throws Exception { HiveConf hiveConf = hiveConfiguration; hiveConf.set("sentry.metastore.plugins", "org.apache.sentry.hdfs.MetastorePlugin"); - hiveConf.set("sentry.service.client.server.rpc-address", "localhost"); - hiveConf.set("sentry.hdfs.service.client.server.rpc-address", "localhost"); + hiveConf.set("sentry.service.client.server.rpc-addresses", "localhost"); + hiveConf.set("sentry.hdfs.service.client.server.rpc-addresses", "localhost"); hiveConf.set("sentry.hdfs.service.client.server.rpc-port", String.valueOf(sentryPort)); hiveConf.set("sentry.service.client.server.rpc-port", String.valueOf(sentryPort)); // hiveConf.set("sentry.service.server.compact.transport", "true"); @@ -694,7 +694,7 @@ public abstract class TestHDFSIntegrationBase { hadoopConf.set("sentry.authorization-provider.cache-stale-threshold.ms", String.valueOf(STALE_THRESHOLD)); hadoopConf.set("sentry.hdfs.service.security.mode", "none"); - hadoopConf.set("sentry.hdfs.service.client.server.rpc-address", "localhost"); + hadoopConf.set("sentry.hdfs.service.client.server.rpc-addresses", "localhost"); hadoopConf.set("sentry.hdfs.service.client.server.rpc-port", String.valueOf(sentryPort)); EditLogFileOutputStream.setShouldSkipFsyncForTesting(true); miniDFS = new MiniDFSCluster.Builder(hadoopConf).build();
