You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/03/26 16:39:40 UTC
[2/9] git commit: updated automatic deployment test configuration -
with new tcp connection parameters - fixed diezel dependency
updated automatic deployment test configuration
- with new tcp connection parameters
- fixed diezel dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/5c41a45b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/5c41a45b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/5c41a45b
Branch: refs/heads/piper
Commit: 5c41a45b18f215f9b261c8e28af82ff37696909c
Parents: 37200dd
Author: Matthieu Morel <mm...@apache.org>
Authored: Mon Mar 26 18:03:11 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Mon Mar 26 18:03:11 2012 +0200
----------------------------------------------------------------------
build.gradle | 12 ++++++------
.../src/test/resources/default.s4.properties | 6 +++++-
.../apache/s4/deploy/TestAutomaticDeployment.java | 3 +--
.../resources/org.apache.s4.deploy.s4.properties | 5 ++++-
4 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/5c41a45b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 740b722..818b968 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ libraries = [
jcip: 'net.jcip:jcip-annotations:1.0',
junit: 'junit:junit:4.10',
zkclient: 'com.github.sgroschupf:zkclient:0.1',
- diezel: 'net.ericaro:diezel-maven-plugin:1.0.0-beta-4-SNAPSHOT'
+ diezel: 'net.ericaro:diezel-maven-plugin:1.0.0-beta-4'
]
subprojects {
@@ -87,17 +87,17 @@ subprojects {
targetCompatibility = 1.6
checkstyleConfigFileName = "$rootDir/config/checkstyle/s4-checkstyle.xml"
-
- // The jmx points to a repo that is no longer available. We exclude these dependencies.
+
+ // The jmx points to a repo that is no longer available. We exclude these dependencies.
configurations {
all*.exclude group: 'com.sun.jmx'
all*.exclude group: 'com.sun.jdmk'
all*.exclude group: 'javax.jms'
all*.exclude group: 'javax.mail'
}
-
+
dependencies {
-
+
/* Google. */
compile( libraries.guava )
compile( libraries.guice )
@@ -115,7 +115,7 @@ subprojects {
/* Misc. */
compile( libraries.jcip )
compile( libraries.zk )
-
+
/* Testing. */
testCompile( libraries.junit )
}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/5c41a45b/subprojects/s4-comm/src/test/resources/default.s4.properties
----------------------------------------------------------------------
diff --git a/subprojects/s4-comm/src/test/resources/default.s4.properties b/subprojects/s4-comm/src/test/resources/default.s4.properties
index 0e31dfa..5834d8d 100644
--- a/subprojects/s4-comm/src/test/resources/default.s4.properties
+++ b/subprojects/s4-comm/src/test/resources/default.s4.properties
@@ -1,9 +1,13 @@
comm.queue_emmiter_size = 8000
comm.queue_listener_size = 8000
+comm.retries=10
+comm.retry_delay=10
+comm.timeout=1000
+tcp.partition.queue_size=256
cluster.hosts = localhost
cluster.ports = 5077
cluster.lock_dir = {user.dir}/tmp
cluster.name = s4-test-cluster
cluster.zk_address = localhost:2181
cluster.zk_session_timeout = 10000
-cluster.zk_connection_timeout = 10000
\ No newline at end of file
+cluster.zk_connection_timeout = 10000
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/5c41a45b/subprojects/s4-core/src/test/java/org/apache/s4/deploy/TestAutomaticDeployment.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/test/java/org/apache/s4/deploy/TestAutomaticDeployment.java b/subprojects/s4-core/src/test/java/org/apache/s4/deploy/TestAutomaticDeployment.java
index 279ccaa..1e26512 100644
--- a/subprojects/s4-core/src/test/java/org/apache/s4/deploy/TestAutomaticDeployment.java
+++ b/subprojects/s4-core/src/test/java/org/apache/s4/deploy/TestAutomaticDeployment.java
@@ -20,7 +20,6 @@ import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.s4.comm.tools.TaskSetup;
import org.apache.s4.comm.topology.ZNRecord;
import org.apache.s4.comm.topology.ZNRecordSerializer;
-import org.apache.s4.deploy.DistributedDeploymentManager;
import org.apache.s4.fixtures.CommTestUtils;
import org.apache.s4.fixtures.CoreTestUtils;
import org.apache.zookeeper.CreateMode;
@@ -186,7 +185,7 @@ public class TestAutomaticDeployment {
record2.putSimpleField(DistributedDeploymentManager.S4R_URI, uri2);
zkClient.create("/" + clusterName + "/apps/testApp2", record2, CreateMode.PERSISTENT);
- Assert.assertTrue(signalApp1Initialized.await(10, TimeUnit.SECONDS));
+ Assert.assertTrue(signalApp1Initialized.await(20, TimeUnit.SECONDS));
Assert.assertTrue(signalApp1Started.await(10, TimeUnit.SECONDS));
Assert.assertTrue(signalApp2Initialized.await(10, TimeUnit.SECONDS));
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/5c41a45b/subprojects/s4-core/src/test/resources/org.apache.s4.deploy.s4.properties
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/test/resources/org.apache.s4.deploy.s4.properties b/subprojects/s4-core/src/test/resources/org.apache.s4.deploy.s4.properties
index 1b03f23..7d029a7 100644
--- a/subprojects/s4-core/src/test/resources/org.apache.s4.deploy.s4.properties
+++ b/subprojects/s4-core/src/test/resources/org.apache.s4.deploy.s4.properties
@@ -1,5 +1,9 @@
comm.queue_emmiter_size = 8000
comm.queue_listener_size = 8000
+comm.retries=10
+comm.retry_delay=10
+comm.timeout=1000
+tcp.partition.queue_size=256
cluster.hosts = localhost
cluster.ports = 5077
cluster.name = s4-test-cluster
@@ -9,4 +13,3 @@ cluster.zk_connection_timeout = 10000
comm.module = org.apache.s4.deploy.TestModule
s4.logger_level = TRACE
appsDir=/tmp/deploy-test
-tcp.partition.queue_size=256
\ No newline at end of file