Author: rvs
Date: Wed Jun 13 16:06:48 2012
New Revision: 1349942
URL: http://svn.apache.org/viewvc?rev=1349942&view=rev
Log:
BIGTOP-626. small misc. issues with the newly introduced Giraph package
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/manifests/init.pp
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/templates/giraph-site.xml
incubator/bigtop/trunk/bigtop-packages/src/common/giraph/install_giraph.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/giraph/control
incubator/bigtop/trunk/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
incubator/bigtop/trunk/bigtop-tests/test-artifacts/giraph/src/main/groovy/org/apache/bigtop/itest/giraphsmoke/TestGiraphSmoke.groovy
Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp?rev=1349942&r1=1349941&r2=1349942&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp Wed Jun 13
16:06:48 2012
@@ -68,6 +68,8 @@ class hadoop_cluster_node {
$hadoop_hbase_zookeeper_quorum = $hadoop_head_node
$hbase_heap_size = extlookup("hbase_heap_size", "1024")
+ $giraph_zookeeper_quorum = $hadoop_head_node
+
$hadoop_zookeeper_ensemble = ["$hadoop_head_node:2888:3888"]
# Set from facter if available
@@ -223,6 +225,7 @@ class hadoop_gateway_node inherits hadoo
mahout::client { "mahout client":
}
giraph::client { "giraph client":
+ zookeeper_quorum => $giraph_zookeeper_quorum,
}
hadoop-pig::client { "pig client":
}
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/manifests/init.pp?rev=1349942&r1=1349941&r2=1349942&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/manifests/init.pp
(original)
+++
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/manifests/init.pp
Wed Jun 13 16:06:48 2012
@@ -14,7 +14,7 @@
# limitations under the License.
class giraph {
- define client {
+ define client($zookeeper_quorum = 'localhost') {
package { "giraph":
ensure => latest,
}
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/templates/giraph-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/templates/giraph-site.xml?rev=1349942&r1=1349941&r2=1349942&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/templates/giraph-site.xml
(original)
+++
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/giraph/templates/giraph-site.xml
Wed Jun 13 16:06:48 2012
@@ -29,7 +29,7 @@ under the License.
<property>
<name>giraph.zkList</name>
- <value>localhost</value>
+ <value><%= zookeeper_quorum %></value>
<description>Prefer external Zookeeper over the embedded one</description>
</property>
</configuration>
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/giraph/install_giraph.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/giraph/install_giraph.sh?rev=1349942&r1=1349941&r2=1349942&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/giraph/install_giraph.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/giraph/install_giraph.sh
Wed Jun 13 16:06:48 2012
@@ -160,3 +160,6 @@ ln -s `cd $PREFIX/$LIB_DIR ; ls giraph*j
# Workaround for GIRAPH-205
ln -s ../giraph.jar $PREFIX/$LIB_DIR/lib
+
+# Enforcing dependency on the Bigtop's version of Zookeeper
+ln -fs /usr/lib/zookeeper/zookeeper.jar $PREFIX/$LIB_DIR/lib/zookeeper*.jar
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/giraph/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/giraph/control?rev=1349942&r1=1349941&r2=1349942&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/giraph/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/giraph/control Wed Jun 13
16:06:48 2012
@@ -23,8 +23,8 @@ Homepage: http://incubator.apache.org/gi
Package: giraph
Architecture: all
-Depends: hadoop-client, bigtop-utils
-Description: Giraph is a BSP inspired graph processing platform that runs on
Hadoop.
+Depends: hadoop-client, zookeeper, bigtop-utils
+Description: Giraph is a BSP inspired graph processing platform that runs on
Hadoop
Giraph implements a graph processing platform to run large scale algorithms
(such as page rank, shared connections, personalization-based popularity,
etc.)
on top of Hadoop infrastructure. Giraph builds upon the graph-oriented nature
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec?rev=1349942&r1=1349941&r2=1349942&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec Wed
Jun 13 16:06:48 2012
@@ -59,7 +59,7 @@ Source1: do-component-build
Source2: install_%{name}.sh
Source3: giraph-site.xml
Buildarch: noarch
-Requires: hadoop-client, bigtop-utils
+Requires: zookeeper, hadoop-client, bigtop-utils
%description
Giraph implements a graph processing platform to run large scale algorithms
(such as page rank, shared connections, personalization-based popularity, etc.)
on top of Hadoop infrastructure. Giraph builds upon the graph-oriented nature
of Pregel but additionally adds fault-tolerance to the coordinator process with
the use of ZooKeeper as its centralized coordination service.
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/giraph/src/main/groovy/org/apache/bigtop/itest/giraphsmoke/TestGiraphSmoke.groovy
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/giraph/src/main/groovy/org/apache/bigtop/itest/giraphsmoke/TestGiraphSmoke.groovy?rev=1349942&r1=1349941&r2=1349942&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-tests/test-artifacts/giraph/src/main/groovy/org/apache/bigtop/itest/giraphsmoke/TestGiraphSmoke.groovy
(original)
+++
incubator/bigtop/trunk/bigtop-tests/test-artifacts/giraph/src/main/groovy/org/apache/bigtop/itest/giraphsmoke/TestGiraphSmoke.groovy
Wed Jun 13 16:06:48 2012
@@ -32,7 +32,7 @@ public class TestGiraphSmoke {
static Shell sh = new Shell("/bin/bash -s")
- @Test
+ @Test(timeout=300000L)
public void testPageRankBenchmark() {
sh.exec("${runnerScript} ${giraphJar}"
+ " org.apache.giraph.benchmark.PageRankBenchmark"
@@ -45,7 +45,7 @@ public class TestGiraphSmoke {
assertEquals("running PageRankBenchmark failed", sh.getRet(), 0);
}
- @Test
+ @Test(timeout=300000L)
public void testRandomMessageBenchmark() {
sh.exec("${runnerScript} ${giraphJar}"
+ " org.apache.giraph.benchmark.RandomMessageBenchmark"
@@ -60,8 +60,7 @@ public class TestGiraphSmoke {
assertEquals("running RandomMessageBenchmark failed", sh.getRet(), 0);
}
-
- @Test
+ @Test(timeout=300000L)
public void testSimpleCheckpointVertex() {
sh.exec("hadoop fs -rmr ${testDir}");
sh.exec("${runnerScript} ${giraphJar}"
@@ -74,7 +73,7 @@ public class TestGiraphSmoke {
assertEquals("running SimpleCheckpointVertex failed", sh.getRet(), 0);
}
- @Test
+ @Test(timeout=300000L)
public void testSimpleVertexWithWorkerContext() {
sh.exec("hadoop fs -rmr ${testDir}");
sh.exec("${runnerScript} ${giraphJar}"
@@ -84,7 +83,7 @@ public class TestGiraphSmoke {
assertEquals("running SimpleCheckpointVertex failed", sh.getRet(), 0);
}
- @Test
+ @Test(timeout=300000L)
public void testSimpleShortestPathsVertex() {
// A graph definition:
// [vertex id, vertex value, [[edge1, value1], .. [edgeN, valueN]]]
