Skip to content

fix possible 'Null storage adapter found' when segments are swapped #2981

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
xvrl wants to merge 1 commit into from
Closed

fix possible 'Null storage adapter found' when segments are swapped #2981

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
11 changes: 6 additions & 5 deletions server/src/main/java/io/druid/segment/realtime/FireHydrant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class FireHydrant
private final int count;
private volatile IncrementalIndex index;
private volatile ReferenceCountingSegment adapter;
private Object swapLock = new Object();
private final Object swapLock = new Object();

public FireHydrant(
IncrementalIndex index,
Expand Down Expand Up @@ -82,16 +82,17 @@ public boolean hasSwapped()
public void swapSegment(Segment adapter)
{
synchronized (swapLock) {
if (this.adapter != null) {
ReferenceCountingSegment oldAdapter = this.adapter;
this.adapter = new ReferenceCountingSegment(adapter);
this.index = null;
if (oldAdapter != null) {
try {
this.adapter.close();
oldAdapter.close();
}
catch (IOException e) {
throw Throwables.propagate(e);
}
}
this.adapter = new ReferenceCountingSegment(adapter);
this.index = null;
}
}

Expand Down