astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-10-07 10:15:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix storage info output with unordered endpoints arguments (#9610)

Browse Source 
Shuffling arguments that we pass to MinIO server are supported. However,
when that happens, Prometheus returns wrong information about disks usage
and online/offline status.

The commit fixes the issue by avoiding relying on xl.endpoints since
it is not ordered.
This commit is contained in:
Anis Elleuch
2020-05-19 22:27:20 +01:00
committed by GitHub
parent bd032d13ff
commit 9baeda781a
14 changed files with 75 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/posix_test.go
+14 -14
View File
@@ -121,7 +121,7 @@ func newPosixTestSetup() (StorageAPI, string, error) {
return nil, "", err
}
// Initialize a new posix layer.
storage, err := newPosix(diskPath)
storage, err := newPosix(diskPath, "")
if err != nil {
return nil, "", err
}
@@ -376,7 +376,7 @@ func TestPosixNewPosix(t *testing.T) {
// Validate all test cases.
for i, testCase := range testCases {
// Initialize a new posix layer.
_, err := newPosix(testCase.name)
_, err := newPosix(testCase.name, "")
if err != testCase.err {
t.Fatalf("TestPosix %d failed wanted: %s, got: %s", i+1, err, testCase.err)
}
@@ -453,7 +453,7 @@ func TestPosixMakeVol(t *testing.T) {
}
// Initialize posix storage layer for permission denied error.
_, err = newPosix(permDeniedDir)
_, err = newPosix(permDeniedDir, "")
if err != nil && !os.IsPermission(err) {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -462,7 +462,7 @@ func TestPosixMakeVol(t *testing.T) {
t.Fatalf("Unable to change permission to temporary directory %v. %v", permDeniedDir, err)
}
posixStorage, err = newPosix(permDeniedDir)
posixStorage, err = newPosix(permDeniedDir, "")
if err != nil {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -555,7 +555,7 @@ func TestPosixDeleteVol(t *testing.T) {
}
// Initialize posix storage layer for permission denied error.
_, err = newPosix(permDeniedDir)
_, err = newPosix(permDeniedDir, "")
if err != nil && !os.IsPermission(err) {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -564,7 +564,7 @@ func TestPosixDeleteVol(t *testing.T) {
t.Fatalf("Unable to change permission to temporary directory %v. %v", permDeniedDir, err)
}
posixStorage, err = newPosix(permDeniedDir)
posixStorage, err = newPosix(permDeniedDir, "")
if err != nil {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -811,7 +811,7 @@ func TestPosixPosixListDir(t *testing.T) {
defer removePermDeniedFile(permDeniedDir)
// Initialize posix storage layer for permission denied error.
_, err = newPosix(permDeniedDir)
_, err = newPosix(permDeniedDir, "")
if err != nil && !os.IsPermission(err) {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -820,7 +820,7 @@ func TestPosixPosixListDir(t *testing.T) {
t.Fatalf("Unable to change permission to temporary directory %v. %v", permDeniedDir, err)
}
posixStorage, err = newPosix(permDeniedDir)
posixStorage, err = newPosix(permDeniedDir, "")
if err != nil {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -938,7 +938,7 @@ func TestPosixDeleteFile(t *testing.T) {
defer removePermDeniedFile(permDeniedDir)
// Initialize posix storage layer for permission denied error.
_, err = newPosix(permDeniedDir)
_, err = newPosix(permDeniedDir, "")
if err != nil && !os.IsPermission(err) {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -947,7 +947,7 @@ func TestPosixDeleteFile(t *testing.T) {
t.Fatalf("Unable to change permission to temporary directory %v. %v", permDeniedDir, err)
}
posixStorage, err = newPosix(permDeniedDir)
posixStorage, err = newPosix(permDeniedDir, "")
if err != nil {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -1136,7 +1136,7 @@ func TestPosixReadFile(t *testing.T) {
defer removePermDeniedFile(permDeniedDir)
// Initialize posix storage layer for permission denied error.
_, err = newPosix(permDeniedDir)
_, err = newPosix(permDeniedDir, "")
if err != nil && !os.IsPermission(err) {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -1145,7 +1145,7 @@ func TestPosixReadFile(t *testing.T) {
t.Fatalf("Unable to change permission to temporary directory %v. %v", permDeniedDir, err)
}
posixPermStorage, err := newPosix(permDeniedDir)
posixPermStorage, err := newPosix(permDeniedDir, "")
if err != nil {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -1306,7 +1306,7 @@ func TestPosixAppendFile(t *testing.T) {
var posixPermStorage StorageAPI
// Initialize posix storage layer for permission denied error.
_, err = newPosix(permDeniedDir)
_, err = newPosix(permDeniedDir, "")
if err != nil && !os.IsPermission(err) {
t.Fatalf("Unable to initialize posix, %s", err)
}
@@ -1315,7 +1315,7 @@ func TestPosixAppendFile(t *testing.T) {
t.Fatalf("Unable to change permission to temporary directory %v. %v", permDeniedDir, err)
}
posixPermStorage, err = newPosix(permDeniedDir)
posixPermStorage, err = newPosix(permDeniedDir, "")
if err != nil {
t.Fatalf("Unable to initialize posix, %s", err)
}