HDFS-10722. Fix race condition in TestEditLog#testBatchedSyncWithClosedLogs. Contributed by Daryn Sharp.
(cherry picked from commit 4a8e6dc02f
)
This commit is contained in:
parent
cefa21e98a
commit
3a85aea42d
|
@ -562,9 +562,12 @@ public class TestEditLog {
|
||||||
|
|
||||||
// Log an edit from thread A
|
// Log an edit from thread A
|
||||||
doLogEdit(threadA, editLog, "thread-a 1");
|
doLogEdit(threadA, editLog, "thread-a 1");
|
||||||
assertEquals("logging edit without syncing should do not affect txid",
|
// async log is doing batched syncs in background. logSync just ensures
|
||||||
1, editLog.getSyncTxId());
|
// the edit is durable, so the txid may increase prior to sync
|
||||||
|
if (!useAsyncEditLog) {
|
||||||
|
assertEquals("logging edit without syncing should do not affect txid",
|
||||||
|
1, editLog.getSyncTxId());
|
||||||
|
}
|
||||||
// logSyncAll in Thread B
|
// logSyncAll in Thread B
|
||||||
doCallLogSyncAll(threadB, editLog);
|
doCallLogSyncAll(threadB, editLog);
|
||||||
assertEquals("logSyncAll should sync thread A's transaction",
|
assertEquals("logSyncAll should sync thread A's transaction",
|
||||||
|
|
Loading…
Reference in New Issue