Issue 3630: Bookiefailovertest failure in docker swarm (pravega#3633)

* Changes bookkeeper.bkAckQuorumSize to 3 in segmentstore * Removes index-volumes mount from bookkeeper and explicitly sets BK_useHostNameAsBookieID to false Signed-off-by: anishakj <[email protected]>
vijikarthi · Apr 16, 2019 · 5c4ce97 · 5c4ce97
1 parent 490864e
commit 5c4ce97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...c/main/java/io/pravega/test/system/framework/services/docker/BookkeeperDockerService.java b/...c/main/java/io/pravega/test/system/framework/services/docker/BookkeeperDockerService.java
@@ -65,8 +65,6 @@ private ServiceSpec setServiceSpec() {
         Map<String, String> labels = new HashMap<>();
         labels.put("com.docker.swarm.service.name", serviceName);
 
-        Mount mount1 = Mount.builder().type("volume").source("index-volume").target("/bk/index")
-                .build();
         Mount mount2 = Mount.builder().type("volume").source("bookkeeper-logs")
                 .target("/opt/dl_all/distributedlog-service/logs/")
                 .build();
@@ -76,10 +74,12 @@ private ServiceSpec setServiceSpec() {
         String env2 = "ZK=" + zk;
         String env3 = "bookiePort=" + String.valueOf(BK_PORT);
         String env4 = "DLOG_EXTRA_OPTS=-Xms512m";
+        String env5 = "BK_useHostNameAsBookieID=false";
         stringList.add(env1);
         stringList.add(env2);
         stringList.add(env3);
         stringList.add(env4);
+        stringList.add(env5);
 
         final TaskSpec taskSpec = TaskSpec
                 .builder().restartPolicy(RestartPolicy.builder().maxAttempts(1).condition(RESTART_POLICY_ANY).build())
@@ -88,7 +88,7 @@ private ServiceSpec setServiceSpec() {
                         .labels(labels)
                         .image(IMAGE_PATH + "nautilus/bookkeeper:" + PRAVEGA_VERSION)
                         .healthcheck(ContainerConfig.Healthcheck.builder().test(defaultHealthCheck(BK_PORT)).build())
-                        .mounts(Arrays.asList(mount1, mount2))
+                        .mounts(Arrays.asList(mount2))
                         .env(stringList).build())
                 .networks(NetworkAttachmentConfig.builder().target(DOCKER_NETWORK).aliases(serviceName).build())
                 .resources(ResourceRequirements.builder()

diff --git a/...va/io/pravega/test/system/framework/services/docker/PravegaSegmentStoreDockerService.java b/...va/io/pravega/test/system/framework/services/docker/PravegaSegmentStoreDockerService.java
@@ -83,6 +83,7 @@ private ServiceSpec setServiceSpec() {
         stringBuilderMap.put("log.level", "DEBUG");
         stringBuilderMap.put("curator-default-session-timeout", String.valueOf(30 * 1000));
         stringBuilderMap.put("hdfs.replaceDataNodesOnFailure", "false");
+        stringBuilderMap.put("bookkeeper.bkAckQuorumSize", "3");
         for (Map.Entry<String, String> entry : stringBuilderMap.entrySet()) {
             systemPropertyBuilder.append("-D").append(entry.getKey()).append("=").append(entry.getValue()).append(" ");
         }