mirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-12-08 10:51:43 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: building reorder-disks under darwin (#18053)

Browse Source 
Also build debugging tools only in tests or with a specific target
This commit is contained in:
Anis Eleuch 2023-09-19 03:19:26 -07:00 committed by GitHub
parent b73699fad8
commit c5279ec630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -45,7 +45,7 @@ lint-fix: getdeps ## runs golangci-lint suite of linters with automatic fixes
@$(GOLANGCI) run --build-tags kqueue --timeout=10m --config ./.golangci.yml --fix @$(GOLANGCI) run --build-tags kqueue --timeout=10m --config ./.golangci.yml --fix
check: test check: test
test: verifiers build ## builds minio, runs linters, tests test: verifiers build build-debugging ## builds minio, runs linters, tests
@echo "Running unit tests" @echo "Running unit tests"
@MINIO_API_REQUESTS_MAX=10000 CGO_ENABLED=0 go test -tags kqueue ./... @MINIO_API_REQUESTS_MAX=10000 CGO_ENABLED=0 go test -tags kqueue ./...
@ -128,10 +128,12 @@ verify-healing-inconsistent-versions: ## verify resolving inconsistent versions
@GORACE=history_size=7 CGO_ENABLED=1 go build -race -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/minio 1>/dev/null @GORACE=history_size=7 CGO_ENABLED=1 go build -race -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/minio 1>/dev/null
@(env bash $(PWD)/buildscripts/resolve-right-versions.sh) @(env bash $(PWD)/buildscripts/resolve-right-versions.sh)
build-debugging:
@(env bash $(PWD)/docs/debugging/build.sh)
build: checks ## builds minio to $(PWD) build: checks ## builds minio to $(PWD)
@echo "Building minio binary to './minio'" @echo "Building minio binary to './minio'"
@CGO_ENABLED=0 go build -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/minio 1>/dev/null @CGO_ENABLED=0 go build -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/minio 1>/dev/null
@(env bash $(PWD)/docs/debugging/build.sh)
hotfix-vars: hotfix-vars:
$(eval LDFLAGS := $(shell MINIO_RELEASE="RELEASE" MINIO_HOTFIX="hotfix.$(shell git rev-parse --short HEAD)" go run buildscripts/gen-ldflags.go $(shell git describe --tags --abbrev=0 | \ $(eval LDFLAGS := $(shell MINIO_RELEASE="RELEASE" MINIO_HOTFIX="hotfix.$(shell git rev-parse --short HEAD)" go run buildscripts/gen-ldflags.go $(shell git describe --tags --abbrev=0 | \

9
docs/debugging/reorder-disks/main.go
View File

@ -99,10 +99,11 @@ func getMajorMinor(path string) (string, error) {
return "", fmt.Errorf("unable to stat `%s`: %w", path, err) return "", fmt.Errorf("unable to stat `%s`: %w", path, err)
} }
major := (stat.Dev & 0x00000000000fff00) >> 8 devID := uint64(stat.Dev)
major |= (stat.Dev & 0xfffff00000000000) >> 32 major := (devID & 0x00000000000fff00) >> 8
minor := (stat.Dev & 0x00000000000000ff) >> 0 major |= (devID & 0xfffff00000000000) >> 32
minor |= (stat.Dev & 0x00000ffffff00000) >> 12 minor := (devID & 0x00000000000000ff) >> 0
minor |= (devID & 0x00000ffffff00000) >> 12
return fmt.Sprintf("%d:%d", major, minor), nil return fmt.Sprintf("%d:%d", major, minor), nil
} }