avoid calling close for nil inbound/outblock channels

remove getReplicationNodeMetrics() from peer metrics groups
remove excessive logging due to runtime.debugStack
2026-10-07 10:15:58 +03:00 · 2024-01-28 19:56:32 -08:00 · 2024-01-28 18:45:20 -08:00 · 2024-01-28 18:10:42 -08:00 · 2024-01-29 01:22:56 +00:00
4 changed files with 12 additions and 6 deletions
@@ -78,7 +78,6 @@ func init() {
 		getMinioHealingMetrics(MetricsGroupOpts{dependGlobalBackgroundHealState: true}),
 		getWebhookMetrics(),
 		getTierMetrics(),
-		getReplicationNodeMetrics(MetricsGroupOpts{dependGlobalObjectAPI: true, dependBucketTargetSys: true}),
 	}

 	allMetricsGroups := func() (allMetrics []*MetricsGroup) {
@@ -2,7 +2,7 @@ version: '3.7'

 # Settings and configurations that are common for all containers
 x-minio-common: &minio-common
-  image: quay.io/minio/minio:RELEASE.2024-01-18T22-51-28Z
+  image: quay.io/minio/minio:RELEASE.2024-01-28T22-35-53Z
  command: server --console-address ":9001" http://minio{1...4}/data{1...2}
  expose:
    - "9000"
@@ -325,9 +325,15 @@ func (m *muxServer) close() {
 	m.cancel()
 	m.recvMu.Lock()
 	defer m.recvMu.Unlock()
-	xioutil.SafeClose(m.inbound)
-	m.inbound = nil

-	xioutil.SafeClose(m.outBlock)
-	m.outBlock = nil
+	if m.inbound != nil {
+		xioutil.SafeClose(m.inbound)
+		m.inbound = nil
+	}
+
+	if m.outBlock != nil {
+		xioutil.SafeClose(m.outBlock)
+		m.outBlock = nil
+
+	}
 }
@@ -424,6 +424,7 @@ func CopyAligned(w io.Writer, r io.Reader, alignedBuf []byte, totalSize int64, f
 func SafeClose[T any](c chan<- T) {
 	if c != nil {
 		close(c)
+		return
 	}
 	// Print stack to check who is sending `c` as `nil`
 	// without crashing the server.
Author	SHA1	Message	Date
Harshavardhana	9987ff570b	avoid calling close for nil inbound/outblock channels	2024-01-28 19:56:32 -08:00
Harshavardhana	cff8235068	remove getReplicationNodeMetrics() from peer metrics groups	2024-01-28 18:45:20 -08:00
Harshavardhana	9ef132c33b	remove excessive logging due to runtime.debugStack	2024-01-28 18:10:42 -08:00
Minio Trusted	ff8269575a	Update yaml files to latest version RELEASE.2024-01-28T22-35-53Z	2024-01-29 01:22:56 +00:00