Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3959 from xiang90/fix_storage_test

Browse Source 
storage: make RestoreContinueUnfinishedCompaction more reliable
This commit is contained in:
Xiang Li 2015-12-04 13:03:29 -08:00
commit 127b529582
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
storage/kvstore_test.go
View File

@ -630,13 +630,22 @@ func TestRestoreContinueUnfinishedCompaction(t *testing.T) {
revbytes := newRevBytes()
// TODO: compact should delete main=2 key too
revToBytes(revision{main: 1}, revbytes)
tx = s1.b.BatchTx()
tx.Lock()
ks, _ := tx.UnsafeRange(keyBucketName, revbytes, nil, 0)
if len(ks) != 0 {
t.Errorf("key for rev %+v still exists, want deleted", bytesToRev(revbytes))
// The disk compaction is done asynchronously and requires more time on slow disk.
// try 5 times for CI with slow IO.
for i := 0; i < 5; i++ {
tx = s1.b.BatchTx()
tx.Lock()
ks, _ := tx.UnsafeRange(keyBucketName, revbytes, nil, 0)
if len(ks) != 0 {
time.Sleep(100 * time.Millisecond)
continue
}
tx.Unlock()
return
}
tx.Unlock()
t.Errorf("key for rev %+v still exists, want deleted", bytesToRev(revbytes))
}
func TestTxnBlockBackendForceCommit(t *testing.T) {