From fbe6718687783a76c6be426d09d07bd3df299a20 Mon Sep 17 00:00:00 2001 From: Chinmay Soman Date: Fri, 7 Dec 2012 15:34:43 -0800 Subject: [PATCH] Creating constants for the default kerberos principal and keytab path --- .../voldemort/store/readonly/fetcher/HdfsFetcher.java | 4 +--- src/java/voldemort/server/VoldemortConfig.java | 9 +++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java index 6209145369..d916097dd6 100644 --- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java +++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java @@ -66,7 +66,7 @@ public class HdfsFetcher implements FileFetcher { private static final Logger logger = Logger.getLogger(HdfsFetcher.class); private static String keytabPath = ""; - private static String kerberosPrincipal = "voldemrt"; + private static String kerberosPrincipal = VoldemortConfig.DEFAULT_KERBEROS_PRINCIPAL; private final Long maxBytesPerSecond, reportingIntervalBytes; private final int bufferSize; @@ -76,8 +76,6 @@ public class HdfsFetcher implements FileFetcher { private long minBytesPerSecond = 0; private DynamicThrottleLimit globalThrottleLimit = null; private static final int NUM_RETRIES = 3; - private String keytabLocation = ""; - private String kerberosUser = "voldemrt"; private VoldemortConfig voldemortConfig = null; public static final String FS_DEFAULT_NAME = "fs.default.name"; diff --git a/src/java/voldemort/server/VoldemortConfig.java b/src/java/voldemort/server/VoldemortConfig.java index 9c02e1e461..c4d56c1398 100644 --- a/src/java/voldemort/server/VoldemortConfig.java +++ b/src/java/voldemort/server/VoldemortConfig.java @@ -57,6 +57,10 @@ public class VoldemortConfig implements Serializable { public static final long REPORTING_INTERVAL_BYTES = 25 * 1024 * 1024; public static final int DEFAULT_BUFFER_SIZE = 64 * 1024; + // Kerberos support for read-only fetches (constants) + public static String DEFAULT_KERBEROS_PRINCIPAL = "voldemrt"; + public static String DEFAULT_KEYTAB_PATH = "/voldemrt.headless.keytab"; + private int nodeId; private String voldemortHome; @@ -274,8 +278,9 @@ public VoldemortConfig(Props props) { DEFAULT_BUFFER_SIZE); this.readOnlyKeytabPath = props.getString("readonly.keytab.path", this.metadataDirectory - + "/voldemrt.headless.keytab"); - this.readOnlyKerberosUser = props.getString("readonly.kerberos.user", "voldemrt"); + + VoldemortConfig.DEFAULT_KEYTAB_PATH); + this.readOnlyKerberosUser = props.getString("readonly.kerberos.user", + VoldemortConfig.DEFAULT_KERBEROS_PRINCIPAL); this.setHadoopConfigPath(props.getString("readonly.hadoop.config.path", this.metadataDirectory + "/hadoop-conf"));