mirror of
https://github.com/pgsty/minio.git
synced 2026-08-14 10:43:15 +03:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 951b6b203b | |||
| 44e23b7f4f | |||
| c22a387695 | |||
| 1ab4d6a6aa |
@@ -21,6 +21,7 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
@@ -819,6 +820,11 @@ func (h *healSequence) healMinioSysMeta(objAPI ObjectLayer, metaPrefix string) f
|
||||
return errHealStopSignalled
|
||||
}
|
||||
|
||||
// Skip metacache entries healing
|
||||
if strings.HasPrefix(object, "buckets/.minio.sys/.metacache/") {
|
||||
return nil
|
||||
}
|
||||
|
||||
err := h.queueHealTask(healSource{
|
||||
bucket: bucket,
|
||||
object: object,
|
||||
|
||||
@@ -54,20 +54,25 @@ func (h *healRoutine) queueHealTask(task healTask) {
|
||||
h.tasks <- task
|
||||
}
|
||||
|
||||
func waitForLowHTTPReq(tolerance int, maxWait time.Duration) {
|
||||
func waitForLowHTTPReq(maxIO int, maxWait time.Duration) {
|
||||
// No need to wait run at full speed.
|
||||
if maxIO <= 0 {
|
||||
return
|
||||
}
|
||||
|
||||
// At max 10 attempts to wait with 100 millisecond interval before proceeding
|
||||
waitCount := 10
|
||||
waitTick := 100 * time.Millisecond
|
||||
|
||||
// Bucket notification and http trace are not costly, it is okay to ignore them
|
||||
// while counting the number of concurrent connections
|
||||
toleranceFn := func() int {
|
||||
return tolerance + globalHTTPListen.NumSubscribers() + globalHTTPTrace.NumSubscribers()
|
||||
maxIOFn := func() int {
|
||||
return maxIO + globalHTTPListen.NumSubscribers() + globalHTTPTrace.NumSubscribers()
|
||||
}
|
||||
|
||||
if httpServer := newHTTPServerFn(); httpServer != nil {
|
||||
// Any requests in progress, delay the heal.
|
||||
for httpServer.GetRequestCount() >= toleranceFn() {
|
||||
for httpServer.GetRequestCount() >= maxIOFn() {
|
||||
time.Sleep(waitTick)
|
||||
waitCount--
|
||||
if waitCount == 0 {
|
||||
|
||||
@@ -10,4 +10,3 @@ docker buildx build --push --no-cache -t "minio/minio:${release}-ubi" \
|
||||
docker buildx prune -f
|
||||
|
||||
sudo sysctl net.ipv6.conf.wlp59s0.disable_ipv6=0
|
||||
|
||||
|
||||
+4
-2
@@ -2,11 +2,14 @@
|
||||
|
||||
sudo sysctl net.ipv6.conf.wlp59s0.disable_ipv6=1
|
||||
|
||||
release=$(git describe --abbrev=0 --tags)
|
||||
docker buildx build --push --no-cache -t "minio/minio:latest" \
|
||||
--platform=linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
|
||||
-f Dockerfile.release .
|
||||
|
||||
docker buildx prune -f
|
||||
|
||||
release=$(git describe --abbrev=0 --tags)
|
||||
|
||||
docker buildx build --push --no-cache -t "minio/minio:${release}" \
|
||||
--platform=linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
|
||||
-f Dockerfile.release .
|
||||
@@ -14,4 +17,3 @@ docker buildx build --push --no-cache -t "minio/minio:${release}" \
|
||||
docker buildx prune -f
|
||||
|
||||
sudo sysctl net.ipv6.conf.wlp59s0.disable_ipv6=0
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ version: '3.7'
|
||||
# it through port 9000.
|
||||
services:
|
||||
minio1:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
volumes:
|
||||
- data1-1:/data1
|
||||
- data1-2:/data2
|
||||
@@ -22,7 +22,7 @@ services:
|
||||
retries: 3
|
||||
|
||||
minio2:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
volumes:
|
||||
- data2-1:/data1
|
||||
- data2-2:/data2
|
||||
@@ -39,7 +39,7 @@ services:
|
||||
retries: 3
|
||||
|
||||
minio3:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
volumes:
|
||||
- data3-1:/data1
|
||||
- data3-2:/data2
|
||||
@@ -56,7 +56,7 @@ services:
|
||||
retries: 3
|
||||
|
||||
minio4:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
volumes:
|
||||
- data4-1:/data1
|
||||
- data4-2:/data2
|
||||
|
||||
@@ -2,7 +2,7 @@ version: '3.7'
|
||||
|
||||
services:
|
||||
minio1:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
hostname: minio1
|
||||
volumes:
|
||||
- minio1-data:/export
|
||||
@@ -29,7 +29,7 @@ services:
|
||||
retries: 3
|
||||
|
||||
minio2:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
hostname: minio2
|
||||
volumes:
|
||||
- minio2-data:/export
|
||||
@@ -56,7 +56,7 @@ services:
|
||||
retries: 3
|
||||
|
||||
minio3:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
hostname: minio3
|
||||
volumes:
|
||||
- minio3-data:/export
|
||||
@@ -83,7 +83,7 @@ services:
|
||||
retries: 3
|
||||
|
||||
minio4:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
hostname: minio4
|
||||
volumes:
|
||||
- minio4-data:/export
|
||||
|
||||
@@ -2,7 +2,7 @@ version: '3.7'
|
||||
|
||||
services:
|
||||
minio1:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
hostname: minio1
|
||||
volumes:
|
||||
- minio1-data:/export
|
||||
@@ -33,7 +33,7 @@ services:
|
||||
retries: 3
|
||||
|
||||
minio2:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
hostname: minio2
|
||||
volumes:
|
||||
- minio2-data:/export
|
||||
@@ -64,7 +64,7 @@ services:
|
||||
retries: 3
|
||||
|
||||
minio3:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
hostname: minio3
|
||||
volumes:
|
||||
- minio3-data:/export
|
||||
@@ -95,7 +95,7 @@ services:
|
||||
retries: 3
|
||||
|
||||
minio4:
|
||||
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
|
||||
image: minio/minio:RELEASE.2020-12-03T00-03-10Z
|
||||
hostname: minio4
|
||||
volumes:
|
||||
- minio4-data:/export
|
||||
|
||||
Reference in New Issue
Block a user