Skip to content

update insert pending segments logic to synchronous #6336

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

Merged
jihoonson merged 5 commits into from
Oct 23, 2018
Merged

update insert pending segments logic to synchronous #6336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbf80a4
1. Mysql default transaction isolation is REPEATABLE_READ, treat it a…
Sep 14, 2018
5089b44
Merge branch 'master' into sync_insert_pendingSegments
Oct 8, 2018
aa716ca
Use TaskLockbox.doInCriticalSection instead of synchronized syntax to…
Oct 8, 2018
9591e95
Merge branch 'master' into sync_insert_pendingSegments
Oct 22, 2018
8acec1c
fix typo for NullPointerException
Oct 22, 2018
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
35 changes: 27 additions & 8 deletions ...service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import org.apache.druid.indexing.common.TaskLockType;
import org.apache.druid.indexing.common.task.Task;
import org.apache.druid.indexing.overlord.CriticalAction;
import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator;
import org.apache.druid.indexing.overlord.LockResult;
import org.apache.druid.java.util.common.IAE;
Expand Down Expand Up @@ -267,14 +269,31 @@ private SegmentIdentifier tryAllocate(
}

if (lockResult.isOk()) {
final SegmentIdentifier identifier = toolbox.getIndexerMetadataStorageCoordinator().allocatePendingSegment(
dataSource,
sequenceName,
previousSegmentId,
tryInterval,
lockResult.getTaskLock().getVersion(),
skipSegmentLineageCheck
);
final SegmentIdentifier identifier;
try {
identifier = toolbox.getTaskLockbox().doInCriticalSection(
task,
ImmutableList.of(tryInterval),
CriticalAction.<SegmentIdentifier>builder()
.onValidLocks(
() -> toolbox.getIndexerMetadataStorageCoordinator().allocatePendingSegment(
dataSource,
sequenceName,
previousSegmentId,
tryInterval,
lockResult.getTaskLock().getVersion(),
skipSegmentLineageCheck
)
).onInvalidLocks(
() -> null
)
.build()
);
}
catch (Exception e) {
throw new RuntimeException(e);
}

if (identifier != null) {
return identifier;
} else {
Expand Down
10 changes: 4 additions & 6 deletions server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,11 @@ public SegmentIdentifier allocatePendingSegment(
Preconditions.checkNotNull(interval, "interval");
Preconditions.checkNotNull(maxVersion, "maxVersion");

return connector.retryTransaction(
new TransactionCallback<SegmentIdentifier>()
return connector.retryWithHandle(
new HandleCallback<SegmentIdentifier>()
{
@Override
public SegmentIdentifier inTransaction(Handle handle, TransactionStatus transactionStatus) throws Exception
public SegmentIdentifier withHandle(Handle handle) throws Exception
{
return skipSegmentLineageCheck ?
allocatePendingSegment(handle, dataSource, sequenceName, interval, maxVersion) :
Expand All @@ -404,9 +404,7 @@ public SegmentIdentifier inTransaction(Handle handle, TransactionStatus transact
maxVersion
);
}
},
ALLOCATE_SEGMENT_QUIET_TRIES,
SQLMetadataConnector.DEFAULT_MAX_TRIES
}
);
}

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.skife.jdbi.v2.DBI;
import org.skife.jdbi.v2.Handle;
import org.skife.jdbi.v2.TransactionCallback;
import org.skife.jdbi.v2.TransactionIsolationLevel;
import org.skife.jdbi.v2.TransactionStatus;
import org.skife.jdbi.v2.exceptions.DBIException;
import org.skife.jdbi.v2.exceptions.UnableToExecuteStatementException;
Expand Down Expand Up @@ -144,7 +145,7 @@ public <T> T retryWithHandle(final HandleCallback<T> callback)
public <T> T retryTransaction(final TransactionCallback<T> callback, final int quietTries, final int maxTries)
{
try {
return RetryUtils.retry(() -> getDBI().inTransaction(callback), shouldRetry, quietTries, maxTries);
return RetryUtils.retry(() -> getDBI().inTransaction(TransactionIsolationLevel.READ_COMMITTED, callback), shouldRetry, quietTries, maxTries);
}
catch (Exception e) {
throw Throwables.propagate(e);
Expand Down