Merge pull request #1461 from rancher/bug-1438

Return opensearch status immediately

plugins/logging/pkg/gateway/admin_v2.go

@@ -3,6 +3,7 @@ package gateway
 import (
 	"context"
 	"errors"
+	"fmt"
 	"regexp"
 	"strings"
 	"time"
@@ -35,20 +36,20 @@ const (
 	ClusterStatusError
 )
 
-func ClusterStatusDescription(s ClusterStatus) string {
+func ClusterStatusDescription(s ClusterStatus, extraInfo ...string) string {
 	switch s {
 	case ClusterStatusPending:
-		return "Opensearch cluster is initializing"
+		return fmt.Sprintf("Opensearch cluster is initializing. %s", strings.Join(extraInfo, ", "))
 	case ClusterStatusGreen:
-		return "Opensearch cluster is green"
+		return fmt.Sprintf("Opensearch cluster is green. %s", strings.Join(extraInfo, ", "))
 	case ClusterStatusYellow:
-		return "Opensearch cluster is yellow"
+		return fmt.Sprintf("Opensearch cluster is yellow. %s", strings.Join(extraInfo, ", "))
 	case ClusterStatusRed:
-		return "Opensearch cluster is red"
+		return fmt.Sprintf("Opensearch cluster is red. %s", strings.Join(extraInfo, ", "))
 	case ClusterStatusError:
-		return "Error fetching status from Opensearch cluster"
+		return fmt.Sprintf("Error fetching status from cluster. %s", strings.Join(extraInfo, ", "))
 	default:
-		return "unknown status"
+		return fmt.Sprintf("Unknown status. %s", strings.Join(extraInfo, ", "))
 	}
 }
 
@@ -186,6 +187,11 @@ func (m *LoggingManagerV2) GetOpensearchStatus(ctx context.Context, _ *emptypb.E
 		status = ClusterStatusRed
 	case opensearchdata.ClusterStatusError:
 		status = ClusterStatusError
+	case opensearchdata.ClusterStatusNoClient:
+		return &loggingadmin.StatusResponse{
+			Status:  int32(ClusterStatusPending),
+			Details: ClusterStatusDescription(ClusterStatusPending, "Waiting for Opensearch client to be initialized"),
+		}, nil
 	}
 
 	return &loggingadmin.StatusResponse{

plugins/logging/pkg/opensearchdata/opensearchdata.go

@@ -37,6 +37,7 @@ const (
 	ClusterStatusYellow
 	ClusterStatusRed
 	ClusterStatusError
+	ClusterStatusNoClient
 )
 
 type Manager struct {

plugins/logging/pkg/opensearchdata/status.go

@@ -2,18 +2,16 @@ package opensearchdata
 
 import (
 	"context"
-	"time"
 
 	"github.com/rancher/opni/pkg/util"
 	"github.com/tidwall/gjson"
 )
 
 func (m *Manager) GetClusterStatus() ClusterStatus {
-	success := m.WaitForInitWithTimeout(30 * time.Second)
-	if !success {
-		m.logger.Error("timed out waiting for opensearch client")
-		return ClusterStatusError
+	if !m.IsInitialized() {
+		return ClusterStatusNoClient
 	}
+
 	m.Lock()
 	defer m.Unlock()
 

plugins/logging/pkg/util/opensearch.go

@@ -86,3 +86,9 @@ func (c *AsyncOpensearchClient) Lock() {
 func (c *AsyncOpensearchClient) Unlock() {
 	c.rw.RUnlock()
 }
+
+func (c *AsyncOpensearchClient) IsInitialized() bool {
+	c.rw.RLock()
+	defer c.rw.RUnlock()
+	return c.initialized
+}