Merge remote-tracking branch 'upstream/master'

.bazelrc

@@ -7,4 +7,20 @@ build:gcc7-later --cxxopt -faligned-new
 build --incompatible_blacklisted_protos_requires_proto_info=false
 build --copt=-fdiagnostics-color=always
 
+build:sanitize-common --strip=never
+build:sanitize-common --copt -O1
+build:sanitize-common --copt -g
+build:sanitize-common --copt -fno-omit-frame-pointer
+
+build:asan --config=sanitize-common
+build:asan --copt -fsanitize=address
+build:asan --copt -DADDRESS_SANITIZER
+build:asan --linkopt -fsanitize=address
+
+build:asan --config=sanitize-common
+build:msan --copt -fsanitize=memory
+build:msan --copt -fsanitize=undefined
+build:msan --linkopt -fsanitize=address
+build:msan --linkopt -fsanitize=undefined
+
 run --copt=-fdiagnostics-color=always

.github/workflows/cppcheck.yml

@@ -0,0 +1,24 @@
+name: Static Checker
+
+on: pull_request
+
+jobs:
+  cppcheck:
+    name: CppCheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: chmorgan/cppcheck-action@v1.4
+        with:
+          enable: all
+          std: c++11
+          inconclusive: disable
+          output_file: ./cppcheck_report.txt
+          other_options: "-j4 --suppressions-list=util/cppcheck/cppcheck.suppressions --error-exitcode=1 -itest -icurvefs/test -inebd/test -inbd/test -icurvefs_python -icurvesnapshot_python -ithirdparties"
+
+      - name: Show cppcheck report
+        if: failure()
+        run: |
+          cat ./cppcheck_report.txt
+          exit 1

.gitignore

@@ -82,6 +82,9 @@ runlog/
 !curve-snapshotcloneserver-nginx/app/lib
 !nebd/nebd-package/usr/bin
 
+# build output
+build
+
 # mac
 .DS_Store
 
@@ -166,3 +169,12 @@ test/integration/snapshotcloneserver/config/*.conf
 
 *.deb
 *.whl
+
+*.class
+curvefs/sdk/java/target/
+curvefs/sdk/java/native/build
+curvefs/sdk/libcurvefs/examples/bin
+curvefs/sdk/output/
+hadoop-test/
+nnbench-test/
+dependency-reduced-pom.xml

.obm.cfg

@@ -1,2 +1,2 @@
-container_name: curve-build-playground-master
-container_image: opencurvedocker/curve-base:build-debian9
+container_name: curve-build-playground.master
+container_image: opencurvedocker/curve-build:ubuntu22

CHANGELOG-2.7.md

@@ -0,0 +1,5 @@
+# CHANGELOG of v2.7
+
+[CHANGELOG-2.7](https://docs.opencurve.io/Release/release-notes-v2.7)
+
+> NOTE: All release notes will be published on our documents site from now on.

Makefile

@@ -1,6 +1,6 @@
 # Copyright (C) 2021 Jingli Chen (Wine93), NetEase Inc.
 
-.PHONY: list build dep install image playground check test docker
+.PHONY: list build dep ci-list ci-build ci-dep install image playground check test docker format
 
 stor?=""
 prefix?= "$(PWD)/projects"
@@ -13,6 +13,14 @@ os?= "debian11"
 ci?=0
 
 define help_msg
+## build curvebs
+	make build stor=bs dep=1
+	make dep stor=bs && make build stor=bs
+
+## build curvefs
+	make build stor=fs dep=1
+    make dep stor=fs && make build stor=fs
+
 ## list
 Usage:
     make list stor=bs/fs
@@ -21,20 +29,25 @@ Examples:
 
 ## build
 Usage:
-    make build stor=bs/fs only=TARGET dep=0/1 release=0/1 os=OS
+    make build stor=bs/fs only=TARGET1,...,TARGETx dep=0/1 release=0/1 os=OS
 Examples:
     make build stor=bs only=//src/chunkserver:chunkserver
-    make build stor=bs only=src/* dep=0
-    make build stor=fs only=test/* os=debian9
-    make build stor=fs release=1
+    make build stor=bs only=src/*,test/* dep=0
+    make build stor=fs only=test/* os=debian11
 
+    make build stor=fs release=1
+Note:
+    Extra build options can be specified using BUILD_OPTS environment variable, which will be passed to bazel build command.
 
 ## dep
+## configure dependency(before build)
 Usage:
     make dep stor=bs/fs
 Examples:
     make dep stor=bs
 
+## ci-list/build/dep
+## use the same way above, but in the container
 
 ## install
 Usage:
@@ -49,7 +62,21 @@ Examples:
 Usage:
     make image stor=bs/fs tag=TAG os=OS
 Examples:
-    make image stor=bs tag=opencurvedocker/curvebs:v1.2 os=debian9
+    make image stor=bs tag=opencurvedocker/curvebs:v1.2 os=debian11
+
+
+## package
+Usage:
+    make <tar|deb> release=0/1 dep=0/1 os=OS
+Examples:
+    make deb
+    make tar release=1 dep=1 os=debian11
+
+
+## playground
+## create/run a container, changes outside will be mapped into the container
+Usage/Example:
+	make playground
 endef
 export help_msg
 
@@ -65,6 +92,9 @@ build:
 dep:
 	@bash util/build.sh --stor=$(stor) --only="" --dep=1
 
+ci-list:
+	@bash util/build_in_image.sh --stor=$(stor) --list
+
 ci-build:
 	@bash util/build_in_image.sh --stor=$(stor) --only=$(only) --dep=$(dep) --release=$(release) --ci=$(ci) --os=$(os)
 
@@ -77,8 +107,11 @@ install:
 image:
 	@bash util/image.sh $(stor) $(tag) $(os)
 
+tar deb:
+	@RELEASE=$(release) DEP=$(dep) OS=$(os) bash util/package.sh $@
+
 playground:
-	@bash util/playground.sh
+	@bash util/playground.sh --version=$(version)
 
 check:
 	@bash util/check.sh $(stor)
@@ -88,3 +121,12 @@ test:
 
 docker:
 	@bash util/docker.sh --os=$(os) --ci=$(ci)
+
+init-hadoop:
+	@bash util/init-hadoop.sh
+
+sdk:
+	@bash util/sdk.sh
+
+clean:
+	@bash util/clean.sh

README.md

@@ -9,7 +9,7 @@
 **A sandbox project hosted by the CNCF Foundation**
 
 #### English | [简体中文](README_cn.md)
-### 📄 [Documents](https://github.com/opencurve/curve/tree/master/docs) || 🌐 [Official Website](https://www.opencurve.io/Curve/HOME) || 🏠 [Forum](https://ask.opencurve.io/t/topic/7)
+### 📄 [Documents](https://docs.opencurve.io/) || 🌐 [Official Website](https://www.opencurve.io/Curve/HOME) || 🏠 [Forum](https://ask.opencurve.io/t/topic/7)
 <div align=left>
 
 <div class="column" align="middle">

README_cn.md

@@ -9,7 +9,7 @@
 **CNCF基金会的沙箱托管项目**
 
 #### [English](README.md) | 简体中文
-### 📄 [文档](https://github.com/opencurve/curve/tree/master/docs) || 🌐 [官网](https://www.opencurve.io/Curve/HOME) || 🏠 [论坛](https://ask.opencurve.io/t/topic/7)
+### 📄 [文档](https://docs.opencurve.io/) || 🌐 [官网](https://www.opencurve.io/Curve/HOME) || 🏠 [论坛](https://ask.opencurve.io/t/topic/7)
 <div align=left>
 
 <div class="column" align="middle">