diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-12-17 22:30:19 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-12-17 22:30:19 -0800 |
| commit | 9abf016af14ef632e9ecdfa09a16323ca2c6417f (patch) | |
| tree | 2b6f4ac33947e30053e2855ab1303d853b1957bd | |
| parent | d9e8479c06bdcc1819f5d67e11fbef9a3b5741f8 (diff) | |
| parent | dbf46b3aa1be49bfa61aca014bb1b9380c1ef51b (diff) | |
| download | seaweedfs-9abf016af14ef632e9ecdfa09a16323ca2c6417f.tar.xz seaweedfs-9abf016af14ef632e9ecdfa09a16323ca2c6417f.zip | |
Merge branch 'master' into support_ssd_volume
| -rw-r--r-- | .github/workflows/release.yml | 35 | ||||
| -rw-r--r-- | weed/storage/store.go | 8 |
2 files changed, 32 insertions, 11 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 521418e2a..70c14487c 100644 --- a/.github/workflows/release.yml +++ b/.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 - goarch: amd64 # default is + goos: ${{ matrix.goos }} + 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 - goarch: amd64 # default is + goos: ${{ matrix.goos }} + 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 }}" diff --git a/weed/storage/store.go b/weed/storage/store.go index 699350392..470ce0c18 100644 --- a/weed/storage/store.go +++ b/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() |