Skip to content

[GOBBLIN-2257] Fix thread-safety of specSyncObjects after parallel onAddSpec #4182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DaisyModi wants to merge 1 commit into from
Closed

[GOBBLIN-2257] Fix thread-safety of specSyncObjects after parallel onAddSpec #4182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions gobblin-runtime/src/main/java/org/apache/gobblin/runtime/spec_catalog/FlowCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
Expand Down Expand Up @@ -97,8 +98,10 @@ public class FlowCatalog extends AbstractIdleService implements SpecCatalog, Mut
@Getter
protected final SpecStore specStore;
// a map which keeps a handle of condition variables for each spec being added to the flow catalog
// to provide synchronization needed for flow specs
private final Map<String, Object> specSyncObjects = new HashMap<>();
// to provide synchronization needed for flow specs.
// Must be ConcurrentHashMap because onAddSpec is no longer synchronized (GOBBLIN-2257), so
// multiple updateOrAddSpecHelper calls can concurrently put/remove entries.
private final Map<String, Object> specSyncObjects = new ConcurrentHashMap<>();

public FlowCatalog(Config config) {
this(config, Optional.absent());
Expand Down Expand Up @@ -359,7 +362,7 @@ private Spec getSpecHelper(URI uri, ExponentialBackoff exponentialBackoff)
if (exponentialBackoff.awaitNextRetryIfAvailable()) {
return getSpecHelper(uri, exponentialBackoff);
} else {
log.error(String.format("The URI %s discovered in SpecStore is missing in FlowCatalog" + ", suspecting current modification on SpecStore", uri), snfe);
log.warn(String.format("The URI %s discovered in SpecStore is missing in FlowCatalog" + ", suspecting current modification on SpecStore", uri), snfe);
}
}
return spec;
Expand Down