Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1389 532ed59c2 -> 914bfad85
minor nothing to GiraphGraphComputer. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/914bfad8 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/914bfad8 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/914bfad8 Branch: refs/heads/TINKERPOP-1389 Commit: 914bfad852755686d7a5146e18d85c16ab4cf57f Parents: 532ed59 Author: Marko A. Rodriguez <[email protected]> Authored: Tue Oct 25 10:33:18 2016 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Tue Oct 25 10:33:18 2016 -0600 ---------------------------------------------------------------------- .../gremlin/giraph/process/computer/GiraphGraphComputer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/914bfad8/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java ---------------------------------------------------------------------- diff --git a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java index 6ffd5ea..e21cd3b 100644 --- a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java +++ b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java @@ -84,7 +84,6 @@ public final class GiraphGraphComputer extends AbstractHadoopGraphComputer imple public GiraphGraphComputer(final HadoopGraph hadoopGraph) { super(hadoopGraph); - System.setProperty(KryoShimServiceLoader.KRYO_SHIM_SERVICE, HadoopPoolShimService.class.getCanonicalName()); // HadoopPools only with Giraph final Configuration configuration = hadoopGraph.configuration(); configuration.getKeys().forEachRemaining(key -> this.giraphConfiguration.set(key, configuration.getProperty(key).toString())); this.giraphConfiguration.setMasterComputeClass(GiraphMemory.class); @@ -97,6 +96,9 @@ public final class GiraphGraphComputer extends AbstractHadoopGraphComputer imple this.giraphConfiguration.setBoolean(GiraphConstants.STATIC_GRAPH.getKey(), true); this.giraphConfiguration.setVertexInputFormatClass(GiraphVertexInputFormat.class); this.giraphConfiguration.setVertexOutputFormatClass(GiraphVertexOutputFormat.class); + if (null == this.giraphConfiguration.get(KryoShimServiceLoader.KRYO_SHIM_SERVICE, null)) + this.giraphConfiguration.set(KryoShimServiceLoader.KRYO_SHIM_SERVICE, HadoopPoolShimService.class.getCanonicalName()); + System.setProperty(KryoShimServiceLoader.KRYO_SHIM_SERVICE, this.giraphConfiguration.get(KryoShimServiceLoader.KRYO_SHIM_SERVICE)); this.useWorkerThreadsInConfiguration = this.giraphConfiguration.getInt(GiraphConstants.MAX_WORKERS, -666) != -666 || this.giraphConfiguration.getInt(GiraphConstants.NUM_COMPUTE_THREADS.getKey(), -666) != -666; }
