This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new e31e1f5dc3b branch-4.0: [opt](tde) Fix rotate framework #58447 (#58531)
e31e1f5dc3b is described below
commit e31e1f5dc3b55df06d129f5621149a945832a08c
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Dec 2 10:14:25 2025 +0800
branch-4.0: [opt](tde) Fix rotate framework #58447 (#58531)
Cherry-picked from #58447
Co-authored-by: Siyang Tang <[email protected]>
---
.../main/java/org/apache/doris/encryption/KeyManagerStore.java | 8 ++++----
.../src/main/java/org/apache/doris/persist/KeyOperationInfo.java | 4 +++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/encryption/KeyManagerStore.java
b/fe/fe-core/src/main/java/org/apache/doris/encryption/KeyManagerStore.java
index 30744dfa591..0ec3cf0c347 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/encryption/KeyManagerStore.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/encryption/KeyManagerStore.java
@@ -43,19 +43,19 @@ public class KeyManagerStore implements Writable {
private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
- private void readLock() {
+ public void readLock() {
lock.readLock().lock();
}
- private void readUnlock() {
+ public void readUnlock() {
lock.readLock().unlock();
}
- private void writeLock() {
+ public void writeLock() {
lock.writeLock().lock();
}
- private void writeUnlock() {
+ public void writeUnlock() {
lock.writeLock().unlock();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/persist/KeyOperationInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/persist/KeyOperationInfo.java
index 833b43c727a..fd14b99b5b7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/KeyOperationInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/KeyOperationInfo.java
@@ -35,7 +35,9 @@ import java.util.List;
public class KeyOperationInfo implements Writable {
public enum KeyOPType {
- SET_ROOT_KEY;
+ SET_ROOT_KEY,
+ ROTATE_ROOT_KEY,
+ ROTATE_MASTER_KEYS
}
@Setter
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
