-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
60460: storage: fix seek bug in pebbleMVCCScanner r=sumeerbhola a=sumeerbhola The seek key in pebbleMVCCScanner.seekVersion was an unsafe key that preceded a number of calls to Next. This used to work because the byte slice in the MVCCKey stayed the same as we were at a different version of the key. With the intentInterleavingIter this is not always true: the unsafe byte slice may have been constructed using the intentIter, which may no longer be in the same position. This was responsible for failures in the cdc/bank roachtest and occasional failures in TestChangefeedNemeses/sinkless, when separated intents were enabled. Some testing with mangling of unsafe keys revealed another bug, in rangefeed.registration, that is also fixed here. Informs #41720 Release note: None Co-authored-by: sumeerbhola <[email protected]>
- Loading branch information
Showing
4 changed files
with
173 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| // Copyright 2021 The Cockroach Authors. | ||
| // | ||
| // Use of this software is governed by the Business Source License | ||
| // included in the file licenses/BSL.txt. | ||
| // | ||
| // As of the Change Date specified in that file, in accordance with | ||
| // the Business Source License, use of this software will be governed | ||
| // by the Apache License, Version 2.0, included in the file | ||
| // licenses/APL.txt. | ||
|
|
||
| package storage | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/cockroachdb/cockroach/pkg/roachpb" | ||
| "github.com/cockroachdb/cockroach/pkg/storage/enginepb" | ||
| "github.com/cockroachdb/cockroach/pkg/util/hlc" | ||
| "github.com/cockroachdb/cockroach/pkg/util/leaktest" | ||
| "github.com/cockroachdb/cockroach/pkg/util/protoutil" | ||
| "github.com/cockroachdb/cockroach/pkg/util/uint128" | ||
| "github.com/cockroachdb/cockroach/pkg/util/uuid" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestMVCCScanWithManyVersionsAndSeparatedIntents(t *testing.T) { | ||
| defer leaktest.AfterTest(t)() | ||
|
|
||
| eng := createTestPebbleEngine().(*Pebble) | ||
| defer eng.Close() | ||
| // Force separated intents for writing. | ||
| eng.wrappedIntentWriter, eng.useWrappedIntentWriter = | ||
| intentDemuxWriter{w: eng, enabledSeparatedIntents: true}, true | ||
|
|
||
| keys := []roachpb.Key{roachpb.Key("a"), roachpb.Key("b"), roachpb.Key("c")} | ||
| // Many versions of each key. | ||
| for i := 1; i < 10; i++ { | ||
| for _, k := range keys { | ||
| require.NoError(t, eng.PutMVCC(MVCCKey{Key: k, Timestamp: hlc.Timestamp{WallTime: int64(i)}}, | ||
| []byte(fmt.Sprintf("%d", i)))) | ||
| } | ||
| } | ||
| // Write a separated lock for the latest version of each key, to make it provisional. | ||
| uuid := uuid.FromUint128(uint128.FromInts(1, 1)) | ||
| meta := enginepb.MVCCMetadata{ | ||
| Txn: &enginepb.TxnMeta{ | ||
| ID: uuid, | ||
| WriteTimestamp: hlc.Timestamp{WallTime: 9}, | ||
| }, | ||
| Timestamp: hlc.LegacyTimestamp{WallTime: 9}, | ||
| Deleted: false, | ||
| KeyBytes: 2, // arbitrary | ||
| ValBytes: 2, // arbitrary | ||
| RawBytes: nil, | ||
| IntentHistory: nil, | ||
| MergeTimestamp: nil, | ||
| TxnDidNotUpdateMeta: nil, | ||
| } | ||
|
|
||
| metaBytes, err := protoutil.Marshal(&meta) | ||
| require.NoError(t, err) | ||
|
|
||
| for _, k := range keys { | ||
| _, err = eng.PutIntent(k, metaBytes, NoExistingIntent, true, uuid) | ||
| require.NoError(t, err) | ||
| } | ||
|
|
||
| reader := eng.NewReadOnly().(*pebbleReadOnly) | ||
| defer reader.Close() | ||
| iter := intentInterleavingReader{wrappableReader: reader}.NewMVCCIterator( | ||
| MVCCKeyAndIntentsIterKind, | ||
| IterOptions{LowerBound: keys[0], UpperBound: roachpb.Key("d")}) | ||
| defer iter.Close() | ||
|
|
||
| // Look for older versions that come after the scanner has exhausted its | ||
| // next optimization and does a seek. The seek key had a bug that caused the | ||
| // scanner to skip keys that it desired to see. | ||
| ts := hlc.Timestamp{WallTime: 2} | ||
| mvccScanner := pebbleMVCCScanner{ | ||
| parent: iter, | ||
| reverse: false, | ||
| start: keys[0], | ||
| end: roachpb.Key("d"), | ||
| ts: ts, | ||
| inconsistent: false, | ||
| tombstones: false, | ||
| failOnMoreRecent: false, | ||
| } | ||
| mvccScanner.init(nil /* txn */, hlc.Timestamp{}) | ||
| _, err = mvccScanner.scan() | ||
| require.NoError(t, err) | ||
|
|
||
| kvData := mvccScanner.results.finish() | ||
| numKeys := mvccScanner.results.count | ||
| require.Equal(t, 3, int(numKeys)) | ||
| type kv struct { | ||
| k MVCCKey | ||
| v []byte | ||
| } | ||
| kvs := make([]kv, numKeys) | ||
| var i int | ||
| require.NoError(t, MVCCScanDecodeKeyValues(kvData, func(k MVCCKey, v []byte) error { | ||
| kvs[i].k = k | ||
| kvs[i].v = v | ||
| i++ | ||
| return nil | ||
| })) | ||
| expectedKVs := make([]kv, len(keys)) | ||
| for i := range expectedKVs { | ||
| expectedKVs[i].k = MVCCKey{Key: keys[i], Timestamp: hlc.Timestamp{WallTime: 2}} | ||
| expectedKVs[i].v = []byte("2") | ||
| } | ||
| require.Equal(t, expectedKVs, kvs) | ||
| } |