From 582b6e1500257b9e7a22a5408c2a559c393c5647 Mon Sep 17 00:00:00 2001 From: Lee moon soo Date: Thu, 23 Jun 2016 22:54:16 -0700 Subject: [PATCH 1/6] reduce spark.cores.max on testing --- .../test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java | 1 + 1 file changed, 1 insertion(+) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java index 5ea3c0943a5..2d37ae95bbf 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java @@ -129,6 +129,7 @@ protected static void startUp() throws Exception { // set spark master sparkIntpSetting.getProperties().setProperty("master", "spark://" + getHostname() + ":7071"); + sparkIntpSetting.getProperties().setProperty("spark.cores.max", "2"); // set spark home for pyspark sparkIntpSetting.getProperties().setProperty("spark.home", getSparkHome()); From 9183e2a79f3f8a3b48fea34aa97c3066811397b2 Mon Sep 17 00:00:00 2001 From: Lee moon soo Date: Thu, 23 Jun 2016 23:11:10 -0700 Subject: [PATCH 2/6] trigger ci --- .../test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java index 2d37ae95bbf..7bedd284c59 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java @@ -127,7 +127,7 @@ protected static void startUp() throws Exception { } } - // set spark master + // set spark master and other properties sparkIntpSetting.getProperties().setProperty("master", "spark://" + getHostname() + ":7071"); sparkIntpSetting.getProperties().setProperty("spark.cores.max", "2"); From 31a247c028865bff8c389392251fc72318d13caa Mon Sep 17 00:00:00 2001 From: Lee moon soo Date: Thu, 23 Jun 2016 23:28:56 -0700 Subject: [PATCH 3/6] trigger ci --- .../test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java index 7bedd284c59..49be647dd85 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java @@ -127,7 +127,7 @@ protected static void startUp() throws Exception { } } - // set spark master and other properties + // set spark master and other properties. sparkIntpSetting.getProperties().setProperty("master", "spark://" + getHostname() + ":7071"); sparkIntpSetting.getProperties().setProperty("spark.cores.max", "2"); From 4f75adebebd362147587c1d633b1527674333d00 Mon Sep 17 00:00:00 2001 From: Lee moon soo Date: Thu, 23 Jun 2016 23:29:14 -0700 Subject: [PATCH 4/6] trigger ci --- .../test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java index 49be647dd85..7bedd284c59 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java @@ -127,7 +127,7 @@ protected static void startUp() throws Exception { } } - // set spark master and other properties. + // set spark master and other properties sparkIntpSetting.getProperties().setProperty("master", "spark://" + getHostname() + ":7071"); sparkIntpSetting.getProperties().setProperty("spark.cores.max", "2"); From b5b7b83f21f95720b1f4d49eba2dd4e4362f0fd6 Mon Sep 17 00:00:00 2001 From: Lee moon soo Date: Thu, 23 Jun 2016 23:52:19 -0700 Subject: [PATCH 5/6] trigger ci --- .../test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java index 7bedd284c59..49be647dd85 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java @@ -127,7 +127,7 @@ protected static void startUp() throws Exception { } } - // set spark master and other properties + // set spark master and other properties. sparkIntpSetting.getProperties().setProperty("master", "spark://" + getHostname() + ":7071"); sparkIntpSetting.getProperties().setProperty("spark.cores.max", "2"); From 4872d669853658de665b394e4c1157a0920f00d8 Mon Sep 17 00:00:00 2001 From: Lee moon soo Date: Thu, 23 Jun 2016 23:52:29 -0700 Subject: [PATCH 6/6] trigger ci --- .../test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java index 49be647dd85..7bedd284c59 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java @@ -127,7 +127,7 @@ protected static void startUp() throws Exception { } } - // set spark master and other properties. + // set spark master and other properties sparkIntpSetting.getProperties().setProperty("master", "spark://" + getHostname() + ":7071"); sparkIntpSetting.getProperties().setProperty("spark.cores.max", "2");