You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2018/03/21 01:09:03 UTC

[1/2] incubator-s2graph git commit: fix spark driver exit abnormally bug

Repository: incubator-s2graph
Updated Branches:
  refs/heads/master 7544a0565 -> 2ce86fa82


fix spark driver exit abnormally bug


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

Branch: refs/heads/master
Commit: 77370726a919100c80fb86f425899e37aeafd2f0
Parents: 7544a05
Author: sandyskies <ch...@163.com>
Authored: Tue Mar 20 17:12:42 2018 +0800
Committer: sandyskies <ch...@163.com>
Committed: Tue Mar 20 17:12:42 2018 +0800

----------------------------------------------------------------------
 .../org/apache/s2graph/s2jobs/loader/GraphFileGenerator.scala      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/77370726/s2jobs/src/main/scala/org/apache/s2graph/s2jobs/loader/GraphFileGenerator.scala
----------------------------------------------------------------------
diff --git a/s2jobs/src/main/scala/org/apache/s2graph/s2jobs/loader/GraphFileGenerator.scala b/s2jobs/src/main/scala/org/apache/s2graph/s2jobs/loader/GraphFileGenerator.scala
index 79eca36..ba47d8a 100644
--- a/s2jobs/src/main/scala/org/apache/s2graph/s2jobs/loader/GraphFileGenerator.scala
+++ b/s2jobs/src/main/scala/org/apache/s2graph/s2jobs/loader/GraphFileGenerator.scala
@@ -38,6 +38,6 @@ object GraphFileGenerator {
       case "SPARK" => HFileGenerator.generate(sc, s2Config, input, options)
       case _ => throw new IllegalArgumentException("only supported type is MR/SPARK.")
     }
-    System.exit(0)
+    sc.stop()
   }
 }


[2/2] incubator-s2graph git commit: [S2GRAPH-184]: spark driver exit abnormally in the loader of s2jobs

Posted by st...@apache.org.
[S2GRAPH-184]: spark driver exit abnormally in the loader of s2jobs

JIRA:
    [S2GRAPH-184] https://issues.apache.org/jira/browse/S2GRAPH-184

Pull Request:
    Closes #139

Author
    sandyskies <ch...@163.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/2ce86fa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/2ce86fa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/2ce86fa8

Branch: refs/heads/master
Commit: 2ce86fa82d4d8a9d1639636c5df6036540da0583
Parents: 7737072
Author: DO YUNG YOON <st...@apache.org>
Authored: Wed Mar 21 10:08:37 2018 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Wed Mar 21 10:08:37 2018 +0900

----------------------------------------------------------------------
 CHANGES | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2ce86fa8/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index da3d682..6a58df3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@ Release Notes - S2Graph - Version 0.2.0
     * [S2GRAPH-179] - Add defaultValue on ColumnMeta
     * [S2GRAPH-178] - Fix null pointer error on BulkLoader
     * [S2GRAPH-181] - MutateVertices yield different state with different storage type
+    * [S2GRAPH-184] - spark driver exit abnormally in the loader of s2jobs
 
 ** Improvement
     * [S2GRAPH-72] - Support Apache TinkerPop and Gremlin