Skip to content

Commit

Permalink
Fix ConcurrentModificationException in OutputSampler
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Rohde committed Aug 24, 2023
1 parent 44b639f commit c8f3b51
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class OutputSampler<T> {
// Temporarily holds exceptional elements. These elements can also be duplicated in the main
// buffer. This is in order to always track exceptional elements even if the number of samples in
// the main buffer drops it.
private final Map<String, ElementSample<T>> exceptions = new HashMap<>();
private Map<String, ElementSample<T>> exceptions = new HashMap<>();

// Maximum number of elements in buffer.
private final int maxElements;
Expand Down Expand Up @@ -198,26 +198,30 @@ public List<BeamFnApi.SampledElement> samples() throws IOException {
// Serializing can take a lot of CPU time for larger or complex elements. Copy the array here
// so as to not slow down the main processing hot path.
List<ElementSample<T>> bufferToSend;
Map<String, ElementSample<T>> exceptionsToSend;
int sampleIndex = 0;
synchronized (this) {
bufferToSend = buffer;
sampleIndex = resampleIndex;
buffer = new ArrayList<>(maxElements);

exceptionsToSend = exceptions;
exceptions = new HashMap<>(exceptions.size());

sampleIndex = resampleIndex;
resampleIndex = 0;
}

// An element can live in both the main samples and exception buffer. Use a small look up table
// to deduplicate samples.
HashSet<Long> seen = new HashSet<>();
ByteStringOutputStream stream = new ByteStringOutputStream();
for (Map.Entry<String, ElementSample<T>> pair : exceptions.entrySet()) {
for (Map.Entry<String, ElementSample<T>> pair : exceptionsToSend.entrySet()) {
String processBundleId = pair.getKey();
ElementSample<T> sample = pair.getValue();
seen.add(sample.id);

ret.add(sampleToProto(sample, stream, processBundleId));
}
exceptions.clear();

for (int i = 0; i < bufferToSend.size(); i++) {
int index = (sampleIndex + i) % bufferToSend.size();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,9 @@ public void testConcurrentSamples() throws IOException, InterruptedException {
}

for (int i = 0; i < 1000000; i++) {
outputSampler.sample(WindowedValue.valueInGlobalWindow(i));
ElementSample<Integer> sample =
outputSampler.sample(WindowedValue.valueInGlobalWindow(i));
outputSampler.exception(sample, new RuntimeException(""), "ptransformId", "pbId");
}

doneSignal.countDown();
Expand All @@ -324,7 +326,9 @@ public void testConcurrentSamples() throws IOException, InterruptedException {
}

for (int i = -1000000; i < 0; i++) {
outputSampler.sample(WindowedValue.valueInGlobalWindow(i));
ElementSample<Integer> sample =
outputSampler.sample(WindowedValue.valueInGlobalWindow(i));
outputSampler.exception(sample, new RuntimeException(""), "ptransformId", "pbId");
}

doneSignal.countDown();
Expand Down

0 comments on commit c8f3b51

Please sign in to comment.