Repository: flink Updated Branches: refs/heads/master 1f55f730a -> a389b4358
[FLINK-8922] Revert "[FLINK-8859][checkpointing] RocksDB backend should 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. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a389b435 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a389b435 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a389b435 Branch: refs/heads/master Commit: a389b4358125b68c83beb01966cec0cfc19e0964 Parents: 1f55f73 Author: Stefan Richter <s.rich...@data-artisans.com> Authored: Mon Mar 12 11:23:40 2018 +0100 Committer: Stefan Richter <s.rich...@data-artisans.com> Committed: Mon Mar 12 11:24:16 2018 +0100 ---------------------------------------------------------------------- .../flink/contrib/streaming/state/RocksDBKeyedStateBackend.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/a389b435/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java ---------------------------------------------------------------------- diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java index 5444dee..8f95b18 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java @@ -680,7 +680,7 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> { 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(); @@ -690,7 +690,7 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> { handle = currentStateHandleKVStateColumnFamilies.get(kvStateId); } } else { - rocksDBKeyedStateBackend.db.put(handle, rocksDBKeyedStateBackend.writeOptions, key, value); + rocksDBKeyedStateBackend.db.put(handle, key, value); } } } @@ -1091,7 +1091,6 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> { if (stateBackend.keyGroupRange.contains(keyGroup)) { stateBackend.db.put(targetColumnFamilyHandle, - stateBackend.writeOptions, iterator.key(), iterator.value()); }
