Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit ebb94b1

Browse files
author
Vamsee Yarlagadda
committed
SENTRY-1897: Rename sentry property to provide the list of sentry servers (Vamsee Yarlagadda, Reviewed by: Na Li, Alexander Kolbasov)
1 parent 5eae90e commit ebb94b1

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

‎conf/sentry-site.xml.hive-client.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<value>8038</value>
3636
</property>
3737
<property>
38-
<name>sentry.service.client.server.rpc-address</name>
38+
<name>sentry.service.client.server.rpc-addresses</name>
3939
<value>localhost</value>
4040
</property>
4141
<property>

‎conf/sentry-site.xml.hive-client.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838

3939
<property>
40-
<name>sentry.service.client.server.rpc-address</name>
40+
<name>sentry.service.client.server.rpc-addresses</name>
4141
<value> </value>
4242
<description> TCP address of the sentry store server</description>
4343
</property>

‎sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/transport/SentryClientTransportConstants.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static class PolicyClientConstants {
6767
static final String SERVER_RPC_PORT = "sentry.service.client.server.rpc-port";
6868

6969
//configuration for server address. It can be coma seperated list of server addresses.
70-
static final String SERVER_RPC_ADDRESS = "sentry.service.client.server.rpc-address";
70+
static final String SERVER_RPC_ADDRESS = "sentry.service.client.server.rpc-addresses";
7171

7272
/**
7373
* This configuration parameter is only meant to be used for testing purposes.
@@ -140,7 +140,7 @@ public static class HDFSClientConstants {
140140
static final String SERVER_RPC_PORT = "sentry.hdfs.service.client.server.rpc-port";
141141

142142
//configuration for server address. It can be coma seperated list of server addresses.
143-
static final String SERVER_RPC_ADDRESS = "sentry.hdfs.service.client.server.rpc-address";
143+
static final String SERVER_RPC_ADDRESS = "sentry.hdfs.service.client.server.rpc-addresses";
144144

145145
/**
146146
* This configuration parameter is only meant to be used for testing purposes.

‎sentry-hdfs/sentry-hdfs-common/src/main/java/org/apache/sentry/hdfs/ServiceConstants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static class ClientConfig {
7373

7474
public static final String SERVER_RPC_PORT = "sentry.hdfs.service.client.server.rpc-port";
7575

76-
public static final String SERVER_RPC_ADDRESS = "sentry.hdfs.service.client.server.rpc-address";
76+
public static final String SERVER_RPC_ADDRESS = "sentry.hdfs.service.client.server.rpc-addresses";
7777

7878
public static final String USE_COMPACT_TRANSPORT = "sentry.hdfs.service.client.compact.transport";
7979
public static final boolean USE_COMPACT_TRANSPORT_DEFAULT = false;

‎sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public static class ServerConfig {
241241
public static class ClientConfig {
242242
public static final String SERVER_RPC_PORT = "sentry.service.client.server.rpc-port";
243243
public static final int SERVER_RPC_PORT_DEFAULT = ServerConfig.RPC_PORT_DEFAULT;
244-
public static final String SERVER_RPC_ADDRESS = "sentry.service.client.server.rpc-address";
244+
public static final String SERVER_RPC_ADDRESS = "sentry.service.client.server.rpc-addresses";
245245
public static final String SERVER_RPC_CONN_TIMEOUT = "sentry.service.client.server.rpc-connection-timeout";
246246

247247
// HA configuration

‎sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ public Void run() throws Exception {
329329
hadoopConf.set("sentry.authorization-provider.cache-stale-threshold.ms", String.valueOf(STALE_THRESHOLD));
330330

331331
hadoopConf.set("sentry.hdfs.service.security.mode", "none");
332-
hadoopConf.set("sentry.hdfs.service.client.server.rpc-address", "localhost");
332+
hadoopConf.set("sentry.hdfs.service.client.server.rpc-addresses", "localhost");
333333
hadoopConf.set("sentry.hdfs.service.client.server.rpc-port", String.valueOf(sentryPort));
334334
EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);
335335
miniDFS = new MiniDFSCluster.Builder(hadoopConf).build();
@@ -487,8 +487,8 @@ private static HiveConf configureHiveAndMetastore() throws IOException, Interrup
487487
public Void run() throws Exception {
488488
HiveConf hiveConf = hiveConfiguration;
489489
hiveConf.set("sentry.metastore.plugins", "org.apache.sentry.hdfs.MetastorePlugin");
490-
hiveConf.set("sentry.service.client.server.rpc-address", "localhost");
491-
hiveConf.set("sentry.hdfs.service.client.server.rpc-address", "localhost");
490+
hiveConf.set("sentry.service.client.server.rpc-addresses", "localhost");
491+
hiveConf.set("sentry.hdfs.service.client.server.rpc-addresses", "localhost");
492492
hiveConf.set("sentry.hdfs.service.client.server.rpc-port", String.valueOf(sentryPort));
493493
hiveConf.set("sentry.service.client.server.rpc-port", String.valueOf(sentryPort));
494494
// hiveConf.set("sentry.service.server.compact.transport", "true");

‎sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,8 @@ private static HiveConf configureHiveAndMetastore() throws IOException, Interrup
526526
public Void run() throws Exception {
527527
HiveConf hiveConf = hiveConfiguration;
528528
hiveConf.set("sentry.metastore.plugins", "org.apache.sentry.hdfs.MetastorePlugin");
529-
hiveConf.set("sentry.service.client.server.rpc-address", "localhost");
530-
hiveConf.set("sentry.hdfs.service.client.server.rpc-address", "localhost");
529+
hiveConf.set("sentry.service.client.server.rpc-addresses", "localhost");
530+
hiveConf.set("sentry.hdfs.service.client.server.rpc-addresses", "localhost");
531531
hiveConf.set("sentry.hdfs.service.client.server.rpc-port", String.valueOf(sentryPort));
532532
hiveConf.set("sentry.service.client.server.rpc-port", String.valueOf(sentryPort));
533533
// hiveConf.set("sentry.service.server.compact.transport", "true");
@@ -694,7 +694,7 @@ public Void run() throws Exception {
694694
hadoopConf.set("sentry.authorization-provider.cache-stale-threshold.ms", String.valueOf(STALE_THRESHOLD));
695695

696696
hadoopConf.set("sentry.hdfs.service.security.mode", "none");
697-
hadoopConf.set("sentry.hdfs.service.client.server.rpc-address", "localhost");
697+
hadoopConf.set("sentry.hdfs.service.client.server.rpc-addresses", "localhost");
698698
hadoopConf.set("sentry.hdfs.service.client.server.rpc-port", String.valueOf(sentryPort));
699699
EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);
700700
miniDFS = new MiniDFSCluster.Builder(hadoopConf).build();

0 commit comments

Comments
 (0)