Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-09 11:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

another effort on fixing the transient error for Broker/CoordinatorServerViewTest happend on Travis build

Browse Source
This commit is contained in:
Bingkun Guo 2015-12-21 11:07:43 -06:00
parent 78215a2053
commit f12cfa99fa
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
server/src/test/java/io/druid/curator/CuratorTestBase.java
View File

@ -20,6 +20,7 @@
package io.druid.curator; package io.druid.curator;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.api.client.repackaged.com.google.common.base.Throwables;
import com.metamx.common.guava.CloseQuietly; import com.metamx.common.guava.CloseQuietly;
import io.druid.client.DruidServer; import io.druid.client.DruidServer;
import io.druid.server.initialization.ZkPathsConfig; import io.druid.server.initialization.ZkPathsConfig;
@ -29,6 +30,7 @@ import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.test.TestingServer; import org.apache.curator.test.TestingServer;
import org.apache.curator.test.Timing; import org.apache.curator.test.Timing;
import org.apache.curator.utils.ZKPaths; import org.apache.curator.utils.ZKPaths;
import org.apache.zookeeper.KeeperException;
/** /**
*/ */
@ -54,26 +56,11 @@ public class CuratorTestBase
} }
protected void setupZNodeForServer(DruidServer server, ZkPathsConfig zkPathsConfig, ObjectMapper jsonMapper) protected void setupZNodeForServer(DruidServer server, ZkPathsConfig zkPathsConfig, ObjectMapper jsonMapper)
throws Exception
{ {
final String announcementsPath = zkPathsConfig.getAnnouncementsPath(); final String announcementsPath = zkPathsConfig.getAnnouncementsPath();
final String inventoryPath = zkPathsConfig.getLiveSegmentsPath(); final String inventoryPath = zkPathsConfig.getLiveSegmentsPath();
final String zNodePathAnnounce = ZKPaths.makePath(announcementsPath, server.getHost()); try {
final String zNodePathSegment = ZKPaths.makePath(inventoryPath, server.getHost());
/*
* Explicitly check whether the zNodes we are about to create exist or not,
* if exist, delete them to make sure we have a clean state on zookeeper.
* Address issue: https://github.com/druid-io/druid/issues/1512
*/
if (curator.checkExists().forPath(zNodePathAnnounce) != null) {
curator.delete().guaranteed().forPath(zNodePathAnnounce);
}
if (curator.checkExists().forPath(zNodePathSegment) != null) {
curator.delete().guaranteed().forPath(zNodePathSegment);
}
curator.create() curator.create()
.creatingParentsIfNeeded() .creatingParentsIfNeeded()
.forPath( .forPath(
@ -84,6 +71,31 @@ public class CuratorTestBase
.creatingParentsIfNeeded() .creatingParentsIfNeeded()
.forPath(ZKPaths.makePath(inventoryPath, server.getHost())); .forPath(ZKPaths.makePath(inventoryPath, server.getHost()));
} }
catch (KeeperException.NodeExistsException e) {
/*
* For some reason, Travis build sometimes fails here because of
* org.apache.zookeeper.KeeperException$NodeExistsException: KeeperErrorCode = NodeExists, though it should never
* happen because zookeeper should be in a clean state for each run of tests.
* Address issue: https://github.com/druid-io/druid/issues/1512
*/
try {
curator.setData()
.forPath(
ZKPaths.makePath(announcementsPath, server.getHost()),
jsonMapper.writeValueAsBytes(server.getMetadata())
);
curator.setData()
.forPath(ZKPaths.makePath(inventoryPath, server.getHost()));
}
catch (Exception e1) {
Throwables.propagate(e1);
}
}
catch (Exception e) {
Throwables.propagate(e);
}
}
protected void tearDownServerAndCurator() protected void tearDownServerAndCurator()
{ {