aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgalarragas <galarragas@gmail.com>2014-09-03 11:22:21 +0100
committergalarragas <galarragas@gmail.com>2014-09-03 11:22:21 +0100
commitd26a8f98f9800549c25cb454a5a57cfe4a45926d (patch)
tree82d88473191d051a24a9ec58e121206da773dccb
parent28268878f992923f27892d89c09ddf34767a9092 (diff)
downloadSpyGlass-d26a8f98f9800549c25cb454a5a57cfe4a45926d.tar.gz
SpyGlass-d26a8f98f9800549c25cb454a5a57cfe4a45926d.zip
Changed version number to prepare for release and added kerberos authentication support to JobRunner4.4
-rw-r--r--pom.xml2
-rw-r--r--src/main/resources/pom.xml2
-rw-r--r--src/main/scala/parallelai/spyglass/base/JobRunner.scala12
3 files changed, 12 insertions, 4 deletions
diff --git a/pom.xml b/pom.xml
index b67fdc9..7ccd6c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<name>Cascading and Scalding wrapper for HBase with advanced features</name>
<groupId>parallelai</groupId>
<artifactId>parallelai.spyglass</artifactId>
- <version>2.10_0.10_4.3</version>
+ <version>2.10_0.10_4.4</version>
<packaging>jar</packaging>
<properties>
diff --git a/src/main/resources/pom.xml b/src/main/resources/pom.xml
index e8d4fc0..d0fa51a 100644
--- a/src/main/resources/pom.xml
+++ b/src/main/resources/pom.xml
@@ -8,7 +8,7 @@
<description>Cascading and Scalding wrapper for HBase with advanced features</description>
<groupId>parallelai</groupId>
<artifactId>parallelai.spyglass</artifactId>
- <version>2.10_0.10_4.3</version>
+ <version>2.10_0.10_4.4</version>
<packaging>jar</packaging>
<organization>
diff --git a/src/main/scala/parallelai/spyglass/base/JobRunner.scala b/src/main/scala/parallelai/spyglass/base/JobRunner.scala
index b3a9af0..3069051 100644
--- a/src/main/scala/parallelai/spyglass/base/JobRunner.scala
+++ b/src/main/scala/parallelai/spyglass/base/JobRunner.scala
@@ -3,7 +3,10 @@ package parallelai.spyglass.base
import org.apache.hadoop.conf.Configuration
import com.twitter.scalding.Tool
import org.apache.hadoop
-
+import org.apache.hadoop.hbase.security.token.TokenUtil
+import org.apache.hadoop.security.UserGroupInformation
+import org.apache.hadoop.hbase.security.User
+
object JobRunner {
def main(args : Array[String]) {
val conf: Configuration = new Configuration
@@ -17,7 +20,12 @@ object JobRunner {
}
AppConfig.jobConfig = conf
-
+
+ if (User.isHBaseSecurityEnabled(conf)) {
+ println("Obtaining token for HBase security.");
+ TokenUtil.obtainAndCacheToken(conf, UserGroupInformation.getCurrentUser());
+ }
+
hadoop.util.ToolRunner.run(conf, new Tool, args);
}
} \ No newline at end of file