import quincy beta 17.1.0

[ceph.git] / ceph / src / rocksdb / db / table_properties_collector.cc

diff --git a/ceph/src/rocksdb/db/table_properties_collector.cc b/ceph/src/rocksdb/db/table_properties_collector.cc
index d98ff5e9b4030fb0808a08b71067428f703dc27b..d877a52c83a8153f832070f5a3e55e95748df1b3 100644 (file)
--- a/ceph/src/rocksdb/db/table_properties_collector.cc
+++ b/ceph/src/rocksdb/db/table_properties_collector.cc
@@ -33,8 +33,9 @@ Status UserKeyTablePropertiesCollector::InternalAdd(const Slice& key,
                                                     const Slice& value,
                                                     uint64_t file_size) {
   ParsedInternalKey ikey;
-  if (!ParseInternalKey(key, &ikey)) {
-    return Status::InvalidArgument("Invalid internal key");
+  Status s = ParseInternalKey(key, &ikey, false /* log_err_key */);  // TODO
+  if (!s.ok()) {
+    return s;
   }
 
   return collector_->AddUserKey(ikey.user_key, value, GetEntryType(ikey.type),