This is an automated email from the ASF dual-hosted git repository.
xuyang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 9f319140186 [enhancement](backup) Add build version in backup snapshot
info (#25513)
9f319140186 is described below
commit 9f319140186d2c5a38eff74e58e47ceaaee55f6a
Author: xy720 <22125576+xy...@users.noreply.github.com>
AuthorDate: Fri Oct 20 14:36:43 2023 +0800
[enhancement](backup) Add build version in backup snapshot info (#25513)
The snapshot info uploaded to S3 obj system by backup job is a json file,
which is useful for us to get information about this snapshot.
If we add version info to the JSON file, we can know what version of the
cluster used to manufacture this snapshot was, in order to prevent restoring
the newer version of the snapshot to the older version of the cluster.
The following info has been added:
```
"major_version": 1,
"minor_version": 2,
"patch_version": 6
```
---
.../src/main/java/org/apache/doris/backup/BackupJobInfo.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java
index fff2b755c10..a199aca7c31 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java
@@ -33,6 +33,7 @@ import org.apache.doris.catalog.TableIf.TableType;
import org.apache.doris.catalog.Tablet;
import org.apache.doris.catalog.View;
import org.apache.doris.common.FeConstants;
+import org.apache.doris.common.Version;
import org.apache.doris.common.io.Text;
import org.apache.doris.common.io.Writable;
import org.apache.doris.persist.gson.GsonUtils;
@@ -92,6 +93,12 @@ public class BackupJobInfo implements Writable {
@SerializedName("meta_version")
public int metaVersion;
+ @SerializedName("major_version")
+ public int majorVersion;
+ @SerializedName("minor_version")
+ public int minorVersion;
+ @SerializedName("patch_version")
+ public int patchVersion;
@SerializedName("tablet_be_map")
public Map<Long, Long> tabletBeMap = Maps.newHashMap();
@@ -588,6 +595,9 @@ public class BackupJobInfo implements Writable {
jobInfo.metaVersion = FeConstants.meta_version;
jobInfo.content = content;
jobInfo.tableCommitSeqMap = tableCommitSeqMap;
+ jobInfo.majorVersion = Version.DORIS_BUILD_VERSION_MAJOR;
+ jobInfo.minorVersion = Version.DORIS_BUILD_VERSION_MINOR;
+ jobInfo.patchVersion = Version.DORIS_BUILD_VERSION_PATCH;
Collection<Table> tbls = backupMeta.getTables().values();
// tbls
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
