Merge branch 'master' into support_ssd_volume

.github/workflows/release.yml

@@ -9,17 +9,35 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        goos: [linux, windows, darwin, freebsd, netbsd, openbsd ]
+        goarch: ["386", amd64]
+        # goarch: ["386", amd64, arm]
     steps:
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
+    - name: Delete old release assets
+      uses: mknejp/delete-release-assets@v1
+      with:
+        token: ${{ github.token }}
+        tag: dev
+        fail-if-no-assets: false 
+        assets: | 
+          weed-large-disk-*
+          weed-*
+
+    - name: Set BUILD_TIME env
+      run: echo BUILD_TIME=$(date -u +%Y-%m-%d-%H-%M) >> ${GITHUB_ENV}
+
     - name: Go Release Binaries
-      uses: wangyoucao577/go-release-action@v1.10
+      uses: wangyoucao577/go-release-action@feature/asset-name
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        goos: linux # default is 
+        goos: ${{ matrix.goos }}
-        goarch: amd64 # default is 
+        goarch: ${{ matrix.goarch }}
         release_tag: dev
         overwrite: true 
         build_flags: -tags 5BytesOffset # optional, default is 
@@ -27,15 +45,18 @@ jobs:
         # Where to run `go build .`
         project_path: weed
         binary_name: weed-large-disk
+        asset_name: "weed-large-disk-${{ env.BUILD_TIME }}-${{ matrix.goos }}-${{ matrix.goarch }}"
+
     - name: Go Release Binaries
-      uses: wangyoucao577/go-release-action@v1.10
+      uses: wangyoucao577/go-release-action@feature/asset-name
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        goos: linux # default is 
+        goos: ${{ matrix.goos }}
-        goarch: amd64 # default is 
+        goarch: ${{ matrix.goarch }}
         release_tag: dev
         overwrite: true 
         ldflags: -extldflags -static -X github.com/chrislusf/seaweedfs/weed/util.COMMIT=${{github.sha}}
         # Where to run `go build .`
         project_path: weed
-        binary_name: weed
+        binary_name: weed-
+        asset_name: "weed-${{ env.BUILD_TIME }}-${{ matrix.goos }}-${{ matrix.goarch }}"

weed/storage/store.go

@@ -267,12 +267,12 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat {
 			location.volumesLock.Lock()
 			for _, vid := range deleteVids {
 				found, err := location.deleteVolumeById(vid)
-				if found {
+				if err == nil {
-					if err == nil {
+					if found {
 						glog.V(0).Infof("volume %d is deleted", vid)
-					} else {
-						glog.V(0).Infof("delete volume %d: %v", vid, err)
 					}
+				} else {
+					glog.V(0).Infof("delete volume %d: %v", vid, err)
 				}
 			}
 			location.volumesLock.Unlock()