This is an automated email from the ASF dual-hosted git repository. mhubail pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit fa6ce67208d988821af03cbc94d56ce6af584873 Author: Murtadha Hubail <[email protected]> AuthorDate: Sun Jun 16 04:53:33 2019 +0300 [NO ISSUE][REPL] Wait For Dataset IO Before Replica Sync - user model changes: no - storage format changes: no - interface changes: yes Details: - Add API in DatasetLifecycleManager to wait for IO on datasets matching a replication strategy. - Before synchronizing the files on a replica, wait for any on-going IO operations on replicated datasets to make sure the set of files won't change while the replica is being synchronized (e.g. a merge operation won't delete a file that we wanted to send to a replica). Change-Id: I01ed5c9379cf7ae249faeef624d5226ea699cf22 Reviewed-on: https://asterix-gerrit.ics.uci.edu/3446 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> --- .../org/apache/asterix/common/api/IDatasetLifecycleManager.java | 8 ++++++++ .../apache/asterix/common/context/DatasetLifecycleManager.java | 9 +++++++++ .../org/apache/asterix/replication/sync/ReplicaSynchronizer.java | 8 ++++++++ 3 files changed, 25 insertions(+) diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java index d18b6ab..0cc3d6d 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java @@ -133,4 +133,12 @@ public interface IDatasetLifecycleManager extends IResourceLifecycleManager<IInd * @throws HyracksDataException */ void flushDataset(IReplicationStrategy replicationStrategy) throws HyracksDataException; + + /** + * Waits for all ongoing IO operations on all open datasets that are matching {@code replicationStrategy}. + * + * @param replicationStrategy + * @throws HyracksDataException + */ + void waitForIO(IReplicationStrategy replicationStrategy) throws HyracksDataException; } diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java index d767219..30b27d8 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java @@ -599,6 +599,15 @@ public class DatasetLifecycleManager implements IDatasetLifecycleManager, ILifeC } } + @Override + public void waitForIO(IReplicationStrategy replicationStrategy) throws HyracksDataException { + for (DatasetResource dsr : datasets.values()) { + if (dsr.isOpen() && replicationStrategy.isMatch(dsr.getDatasetID())) { + dsr.getDatasetInfo().waitForIO(); + } + } + } + private void closeIndex(IndexInfo indexInfo) throws HyracksDataException { if (indexInfo.isOpen()) { ILSMOperationTracker opTracker = indexInfo.getIndex().getOperationTracker(); diff --git a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaSynchronizer.java b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaSynchronizer.java index 09f1205..0f0b5bd 100644 --- a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaSynchronizer.java +++ b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/sync/ReplicaSynchronizer.java @@ -53,10 +53,12 @@ public class ReplicaSynchronizer { private void syncFiles() throws IOException { final ReplicaFilesSynchronizer fileSync = new ReplicaFilesSynchronizer(appCtx, replica); + waitForReplicatedDatasetsIO(); fileSync.sync(); // flush replicated dataset to generate disk component for any remaining in-memory components final IReplicationStrategy replStrategy = appCtx.getReplicationManager().getReplicationStrategy(); appCtx.getDatasetLifecycleManager().flushDataset(replStrategy); + waitForReplicatedDatasetsIO(); // sync any newly generated files fileSync.sync(); } @@ -75,4 +77,10 @@ public class ReplicaSynchronizer { (PersistentLocalResourceRepository) appCtx.getLocalResourceRepository(); return localResourceRepository.getReplicatedIndexesMaxComponentId(partition, replStrategy); } + + private void waitForReplicatedDatasetsIO() throws HyracksDataException { + // wait for IO operations to ensure replicated datasets files won't change during replica sync + final IReplicationStrategy replStrategy = appCtx.getReplicationManager().getReplicationStrategy(); + appCtx.getDatasetLifecycleManager().waitForIO(replStrategy); + } }
