fix renaming encrypted directory and check compaction paused during checkpoint

encryption/encryption.cc

@@ -527,23 +527,22 @@ Status KeyManagedEncryptedEnv::RenameFile(const std::string& src_fname,
  }
  s = target()->RenameFile(src_fname, dst_fname);
  if (s.ok()) {
- s = key_manager_->DeleteFile(src_fname);
+ s = key_manager_->DeleteFileExt(src_fname, dst_fname);
  } else {
  Status delete_status __attribute__((__unused__)) =
- key_manager_->DeleteFile(dst_fname);
+ key_manager_->DeleteFileExt(dst_fname, src_fname);
  assert(delete_status.ok());
  }
  return s;
 }
 
 Status KeyManagedEncryptedEnv::DeleteDir(const std::string& dname) {
- Status s = target()->DeleteDir(dname);
+ // We don't guarantee atomicity. Delete keys first.
+ Status s = key_manager_->DeleteFile(dname);
  if (!s.ok()) {
  return s;
  }
- // We don't use a dedicated `DeleteDir` function, because RocksDB already uses
- // `RenameFile` for both file and directory.
- return key_manager_->DeleteFile(dname);
+ return target()->DeleteDir(dname);
 }
 
 Env* NewKeyManagedEncryptedEnv(Env* base_env,

include/rocksdb/encryption.h

@@ -58,6 +58,12 @@ class KeyManager {
  virtual Status DeleteFile(const std::string& fname) = 0;
  virtual Status LinkFile(const std::string& src_fname,
  const std::string& dst_fname) = 0;
+ // Provide additional hint of physical file when the key name doesn't map to
+ // one.
+ virtual Status DeleteFileExt(const std::string& fname,
+ const std::string& /*physical_fname*/) {
+ return DeleteFile(fname);
+ }
 };
 
 // An Env with underlying files being encrypted. It holds a reference to an