Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-03-04 08:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #216 from metamx/announce-fix

Browse Source 
Make batch data segment announcer thread safe
This commit is contained in:
fjy 2013-08-12 18:54:23 -07:00
commit 08e2b94e41
1 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
client/src/main/java/com/metamx/druid/coordination/BatchDataSegmentAnnouncer.java
View File

@ -36,6 +36,8 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.atomic.AtomicLong;
/**
*/
@ -48,8 +50,11 @@ public class BatchDataSegmentAnnouncer extends AbstractDataSegmentAnnouncer
private final ObjectMapper jsonMapper;
private final String liveSegmentLocation;
private final Set<SegmentZNode> availableZNodes = Sets.newHashSet();
private final Map<DataSegment, SegmentZNode> segmentLookup = Maps.newHashMap();
private final Object lock = new Object();
private final AtomicLong counter = new AtomicLong(0);
private final Set<SegmentZNode> availableZNodes = new ConcurrentSkipListSet<SegmentZNode>();
private final Map<DataSegment, SegmentZNode> segmentLookup = Maps.newConcurrentMap();
public BatchDataSegmentAnnouncer(
DruidServerMetadata server,
@ -74,6 +79,7 @@ public class BatchDataSegmentAnnouncer extends AbstractDataSegmentAnnouncer
throw new ISE("byte size %,d exceeds %,d", newBytesLen, config.getMaxNumBytes());
}
synchronized (lock) {
// create new batch
if (availableZNodes.isEmpty()) {
SegmentZNode availableZNode = new SegmentZNode(makeServedSegmentPath(new DateTime().toString()));
@ -104,11 +110,17 @@ public class BatchDataSegmentAnnouncer extends AbstractDataSegmentAnnouncer
}
}
}
}
@Override
public void unannounceSegment(DataSegment segment) throws IOException
{
final SegmentZNode segmentZNode = segmentLookup.remove(segment);
if (segmentZNode == null) {
return;
}
synchronized (lock) {
segmentZNode.removeSegment(segment);
log.info("Unannouncing segment[%s] at path[%s]", segment.getIdentifier(), segmentZNode.getPath());
@ -120,6 +132,7 @@ public class BatchDataSegmentAnnouncer extends AbstractDataSegmentAnnouncer
availableZNodes.add(segmentZNode);
}
}
}
@Override
public void announceSegments(Iterable<DataSegment> segments) throws IOException
@ -167,10 +180,10 @@ public class BatchDataSegmentAnnouncer extends AbstractDataSegmentAnnouncer
private String makeServedSegmentPath(String zNode)
{
return ZKPaths.makePath(liveSegmentLocation, zNode);
return ZKPaths.makePath(liveSegmentLocation, String.format("%s%s", zNode, counter.getAndIncrement()));
}
private class SegmentZNode
private class SegmentZNode implements Comparable<SegmentZNode>
{
private final String path;
@ -286,5 +299,11 @@ public class BatchDataSegmentAnnouncer extends AbstractDataSegmentAnnouncer
{
return path.hashCode();
}
@Override
public int compareTo(SegmentZNode segmentZNode)
{
return path.compareTo(segmentZNode.getPath());
}
}
}