You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/08/31 11:08:42 UTC

incubator-kylin git commit: test 2

Repository: incubator-kylin
Updated Branches:
  refs/heads/KYLIN-956-2 842729953 -> 1c8e5dd04


test 2


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1c8e5dd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1c8e5dd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1c8e5dd0

Branch: refs/heads/KYLIN-956-2
Commit: 1c8e5dd04bfb91e5565f031dfdd2ca7c22e48d30
Parents: 8427299
Author: honma <ho...@ebay.com>
Authored: Mon Aug 31 17:10:26 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Mon Aug 31 17:10:26 2015 +0800

----------------------------------------------------------------------
 .../org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java  | 2 +-
 .../java/org/apache/kylin/job/BuildCubeWithEngineTest.java     | 6 +++++-
 .../java/org/apache/kylin/job/BuildCubeWithStreamTest.java     | 2 +-
 .../test/java/org/apache/kylin/job/BuildIIWithEngineTest.java  | 2 +-
 .../test/java/org/apache/kylin/job/BuildIIWithStreamTest.java  | 2 +-
 .../java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java | 2 +-
 .../org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java  | 2 +-
 server/src/main/java/org/apache/kylin/rest/DebugTomcat.java    | 4 ++--
 .../java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java | 3 +++
 .../apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java  | 2 +-
 10 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
----------------------------------------------------------------------
diff --git a/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java b/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
index cbea658..47a0e73 100644
--- a/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
+++ b/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
@@ -79,7 +79,7 @@ public class BuildCubeWithSparkTest {
         ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
         System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
-        System.setProperty("LD_LIBRARY_PATH", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
+        System.setProperty("java.library.path", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
 
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
index 1538594..31f133d 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
@@ -86,7 +86,11 @@ public class BuildCubeWithEngineTest {
         ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
         System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
-        System.setProperty("LD_LIBRARY_PATH", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/"); 
+        
+        System.out.println("java.library.path is set to: " + System.getProperty("java.library.path"));
+        System.out.println("LD_LIBRARY_PATH is set to: " + System.getenv("LD_LIBRARY_PATH"));
+        
+        System.setProperty("java.library.path", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/"); 
     }
 
     @Before

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java b/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
index bc05a7c..3fbe6d2 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
@@ -75,7 +75,7 @@ public class BuildCubeWithStreamTest {
         ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
         System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
-        System.setProperty("LD_LIBRARY_PATH", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
+        System.setProperty("java.library.path", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
 
 
     }

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
index ba220ff..4d9d3a0 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
@@ -94,7 +94,7 @@ public class BuildIIWithEngineTest {
         logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
-        System.setProperty("LD_LIBRARY_PATH", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
+        System.setProperty("java.library.path", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
 
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
index 2579ba4..900d101 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
@@ -95,7 +95,7 @@ public class BuildIIWithStreamTest {
         logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
-        System.setProperty("LD_LIBRARY_PATH", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
+        System.setProperty("java.library.path", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
 
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java b/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
index 469050c..9ee0696 100644
--- a/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
+++ b/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
@@ -46,7 +46,7 @@ public class DeployLocalMetaToRemoteTest {
         ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
         System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
-        System.setProperty("LD_LIBRARY_PATH", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
+        System.setProperty("java.library.path", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
 
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java b/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
index 27df7c4..3a4c4fc 100644
--- a/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
+++ b/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
@@ -61,7 +61,7 @@ public class ITKafkaBasedIIStreamBuilderTest {
     public static void beforeClass() throws Exception {
         ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
-        System.setProperty("LD_LIBRARY_PATH", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
+        System.setProperty("java.library.path", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
 
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
index 44df6b3..e769e38 100644
--- a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
+++ b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
@@ -49,8 +49,8 @@ public class DebugTomcat {
             if (System.getProperty("hdp.version") == null)
                 System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
 
-            if (System.getProperty("hdp.version") == null)
-                System.setProperty("LD_LIBRARY_PATH", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
+            if (System.getProperty("java.library.path") == null)
+                System.setProperty("java.library.path", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
 
             // workaround for job submission from win to linux -- https://issues.apache.org/jira/browse/MAPREDUCE-4052
             if (Shell.WINDOWS) {

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
index 5059a37..6244a33 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
@@ -48,6 +48,9 @@ public class BulkLoadJob extends AbstractHadoopJob {
         Options options = new Options();
 
         try {
+            System.out.println("java.library.path is set to: " + System.getProperty("java.library.path"));
+            System.out.println("LD_LIBRARY_PATH is set to: " + System.getenv("LD_LIBRARY_PATH"));
+            
             options.addOption(OPTION_INPUT_PATH);
             options.addOption(OPTION_HTABLE_NAME);
             options.addOption(OPTION_CUBE_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1c8e5dd0/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java
index 2197609..7dda9d6 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java
@@ -42,7 +42,7 @@ public class SandboxMetastoreCLI {
         ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
         System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
         System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
-        System.setProperty("LD_LIBRARY_PATH", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
+        System.setProperty("java.library.path", "/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64/");
 
 
         if (args.length < 2) {