Skip to content

Commit

Permalink
[FLINK-8922] Revert "[FLINK-8859][checkpointing] RocksDB backend shou…
Browse files Browse the repository at this point in the history
…ld pass WriteOption to Rocks.put() when restoring"

We need to revert FLINK-8859 because it causes problems with RocksDB that make our automated tests fail on Travis.
The change looks actually good and it is currently unclear why this can introduce such a problem. This might also be a Rocks in RocksDB.
Nevertheless, for the sake of a proper release testing, we should revert the change for now.
  • Loading branch information
StefanRRichter committed Mar 12, 2018
1 parent 1f55f73 commit a389b43
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ private void restoreKVStateData() throws IOException, RocksDBException {
if (RocksDBFullSnapshotOperation.hasMetaDataFollowsFlag(key)) {
//clear the signal bit in the key to make it ready for insertion again
RocksDBFullSnapshotOperation.clearMetaDataFollowsFlag(key);
rocksDBKeyedStateBackend.db.put(handle, rocksDBKeyedStateBackend.writeOptions, key, value);
rocksDBKeyedStateBackend.db.put(handle, key, value);
//TODO this could be aware of keyGroupPrefixBytes and write only one byte if possible
kvStateId = RocksDBFullSnapshotOperation.END_OF_KEY_GROUP_MARK
& compressedKgInputView.readShort();
Expand All @@ -690,7 +690,7 @@ private void restoreKVStateData() throws IOException, RocksDBException {
handle = currentStateHandleKVStateColumnFamilies.get(kvStateId);
}
} else {
rocksDBKeyedStateBackend.db.put(handle, rocksDBKeyedStateBackend.writeOptions, key, value);
rocksDBKeyedStateBackend.db.put(handle, key, value);
}
}
}
Expand Down Expand Up @@ -1091,7 +1091,6 @@ private void restoreKeyGroupsShardWithTemporaryHelperInstance(

if (stateBackend.keyGroupRange.contains(keyGroup)) {
stateBackend.db.put(targetColumnFamilyHandle,
stateBackend.writeOptions,
iterator.key(), iterator.value());
}

Expand Down

0 comments on commit a389b43

Please sign in to comment.