Fix issue with describe http-server and proxy

Author: Tim Middleton

docs/reference/15_members.adoc

@@ -107,9 +107,9 @@ Output:
 ----
 NODE ID  ADDRESS     PORT   PROCESS  MEMBER                         ROLE              PKT SENT  PKT REC  RESENT  EFFICIENCY  SEND Q  DATA SENT  DATA REC  WEAKEST
       1  /127.0.0.1  50724    81363  storage-1                      CoherenceServer        531      586       2     100.00%       0       8 MB      9 MB        4
-      2  /127.0.0.1  50725    81364  storage-2                      CoherenceServer        181      152       0     100.00%       0       8 MB      8 MB       -1
-      3  /127.0.0.1  50726    81362  storage-0                      CoherenceServer        182      148       0     100.00%       0       7 MB     10 MB       -1
-      4  /127.0.0.1  50968    81733  com.tangosol.net.CacheFactory  CoherenceConsole        64       58       0     100.00%       0       3 MB      0 MB       -1
+      2  /127.0.0.1  50725    81364  storage-2                      CoherenceServer        181      152       0     100.00%       0       8 MB      8 MB        -
+      3  /127.0.0.1  50726    81362  storage-0                      CoherenceServer        182      148       0     100.00%       0       7 MB     10 MB        -
+      4  /127.0.0.1  50968    81733  com.tangosol.net.CacheFactory  CoherenceConsole        64       58       0     100.00%       0       3 MB      0 MB        -
 ----
 
 [#get-p2p-stats]

docs/reference/20_services.adoc

@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
     Licensed under the Universal Permissive License v 1.0 as shown at
     https://oss.oracle.com/licenses/upl.
 
@@ -238,11 +238,11 @@ Output:
 [source,bash]
 ----
 SERVICE NAME         TYPE              MEMBERS  STATUS HA  STORAGE  SENIOR PARTITIONS
-Proxy                Proxy                   2  n/a             -1       1         -1
+Proxy                Proxy                   2  n/a              0       1          -
 PartitionedTopic     DistributedCache        2  NODE-SAFE        2       2        257
 PartitionedCache2    DistributedCache        2  NODE-SAFE        2       2        257
 PartitionedCache     DistributedCache        2  NODE-SAFE        2       1        257
-ManagementHttpProxy  Proxy                   1  n/a             -1       1         -1
+ManagementHttpProxy  Proxy                   1  n/a              0       1          -
 ----
 
 [source,bash]

pkg/cmd/formatting.go

@@ -236,7 +236,7 @@ func FormatFederationDetails(federationDetails []config.FederationDescription, t
 		var nodeID, _ = strconv.Atoi(value.NodeID)
 		table.AddRow(formatSmallInteger(int32(nodeID)))
 
-		if target == "destinations" {
+		if target == destinations {
 			bytes = value.TotalBytesSent
 			messages = value.TotalMsgSent
 			records = value.TotalRecordsSent
@@ -359,7 +359,7 @@ func FormatFederationSummary(federationSummaries []config.FederationSummary, tar
 	)
 
 	for _, value := range federationSummaries {
-		if target == "destinations" {
+		if target == destinations {
 			bytes = value.TotalBytesSent.Sum
 			messages = value.TotalMsgSent.Sum
 			records = value.TotalRecordsSent.Sum
@@ -956,8 +956,8 @@ func FormatCacheDetailsSizeAndAccess(cacheDetails []config.CacheDetail) string {
 		if OutputFormat == constants.WIDE {
 			table.AddColumnsToRow(formatLargeInteger(totalHits),
 				formatLargeInteger(value.CacheMisses), formatPercent(hitProb),
-				formatLargeInteger(value.StoreReads), formatLargeInteger(value.StoreWrites),
-				formatLargeInteger(value.StoreFailures))
+				formatLargeIntegerOrDash(value.StoreReads), formatLargeIntegerOrDash(value.StoreWrites),
+				formatLargeIntegerOrDash(value.StoreFailures))
 		}
 	}
 
@@ -1521,7 +1521,7 @@ func FormatNetworkStatistics(members []config.Member) string {
 		table.AddColumnsToRow(formatLargeInteger(value.PacketsSent), formatLargeInteger(value.PacketsReceived),
 			formatLargeInteger(value.PacketsResent), formatPercent(value.PacketDeliveryEfficiency),
 			formatLargeInteger(value.SendQueueSize), formattingFunction(value.TransportSentBytes),
-			formattingFunction(value.TransportReceivedBytes), formatSmallInteger(value.WeakestChannel))
+			formattingFunction(value.TransportReceivedBytes), formatSmallIntegerOrDash(value.WeakestChannel))
 	}
 
 	return table.String()
@@ -1685,18 +1685,18 @@ func FormatServices(services []config.ServiceSummary) string {
 	table := newFormattedTable().WithHeader(ServiceNameColumn, "TYPE", MembersColumn, "STATUS HA", "STORAGE",
 		"SENIOR", partitions, "STATUS").WithSortingColumn(ServiceNameColumn)
 	if OutputFormat == constants.WIDE {
-		table.WithAlignment(L, L, R, L, R, R, R, L, R, R, R, L)
-		table.AddHeaderColumns(endangered, "VULNERABLE", "UNBALANCED", "SUSPENDED")
+		table.WithAlignment(L, L, R, L, R, R, R, L, R, R, R, R, L)
+		table.AddHeaderColumns(endangered, "VULNERABLE", "UNBALANCED", "PENDING REQ", "SUSPENDED")
 		table.AddFormattingFunction(8, endangeredPartitionsFormatter)
 		table.AddFormattingFunction(9, vulnerablePartitionsFormatter)
 		table.AddFormattingFunction(10, vulnerablePartitionsFormatter)
 		table.AddFormattingFunction(11, yesBoolFormatter)
 	} else {
-		table.WithAlignment(L, L, R, L, R, R, R, L)
+		table.WithAlignment(L, L, R, L, R, R, R, R, L)
 	}
 
 	table.AddFormattingFunction(3, statusHAFormatter)
-	table.AddFormattingFunction(7, statusHAFormatter)
+	table.AddFormattingFunction(8, statusHAFormatter)
 
 	for _, value := range services {
 		var (
@@ -1729,12 +1729,13 @@ func FormatServices(services []config.ServiceSummary) string {
 
 		table.AddRow(value.ServiceName, value.ServiceType, formatSmallInteger(value.MemberCount),
 			value.StatusHA, formatSmallInteger(value.StorageEnabledCount), formatSmallInteger(value.SeniorMemberID),
-			formatSmallInteger(value.PartitionsAll), status)
+			formatSmallIntegerOrDash(value.PartitionsAll), status)
 
 		if OutputFormat == constants.WIDE {
-			table.AddColumnsToRow(formatSmallInteger(value.PartitionsEndangered),
-				formatSmallInteger(value.PartitionsVulnerable),
-				formatSmallInteger(value.PartitionsUnbalanced), suspended)
+			table.AddColumnsToRow(formatSmallIntegerOrDash(value.PartitionsEndangered),
+				formatSmallIntegerOrDash(value.PartitionsVulnerable),
+				formatSmallIntegerOrDash(value.PartitionsUnbalanced),
+				formatSmallInteger(value.RequestPendingCount), suspended)
 		}
 	}
 
@@ -2102,6 +2103,22 @@ func formatSmallInteger(value int32) string {
 	return printer.Sprintf("%d", value)
 }
 
+// formatSmallIntegerOrDash formats a small integer but if the value is -1 returns "n/a"
+func formatSmallIntegerOrDash(value int32) string {
+	if value == -1 {
+		return "-"
+	}
+	return formatSmallInteger(value)
+}
+
+// formatLargeIntegerOrDash formats a large integer but if the value is -1 returns "n/a"
+func formatLargeIntegerOrDash(value int64) string {
+	if value == -1 {
+		return "-"
+	}
+	return formatLargeInteger(value)
+}
+
 // formatPort formats a small integer with a max length.
 func formatPort(value int32) string {
 	return fmt.Sprintf("%d", value)

pkg/cmd/http_server.go

@@ -35,7 +35,7 @@ var getHTTPProxiesCmd = &cobra.Command{
 			return err
 		}
 
-		details, err := returnGetProxiesDetails(cmd, httpString, dataFetcher, connection)
+		details, err := returnGetProxiesDetails(cmd, httpString, dataFetcher, connection, "")
 		if err != nil {
 			return err
 		}
@@ -99,7 +99,7 @@ var describeHTTPProxyCmd = &cobra.Command{
 			return err
 		}
 
-		err = displayProxyDetails(cmd, dataFetcher, connection, httpString, serviceResult, proxyResults)
+		err = displayProxyDetails(cmd, dataFetcher, connection, httpString, serviceResult, proxyResults, serviceName)
 		if err != nil {
 			return err
 		}

pkg/cmd/proxy.go

@@ -44,7 +44,7 @@ servers for a cluster. You can specify '-o wide' to display addition information
 			return err
 		}
 
-		details, err := returnGetProxiesDetails(cmd, tcpString, dataFetcher, connection)
+		details, err := returnGetProxiesDetails(cmd, tcpString, dataFetcher, connection, "")
 		if err != nil {
 			return err
 		}
@@ -127,7 +127,7 @@ all nodes running the proxy service as well as detailed connection information.`
 			}
 		}
 
-		err = displayProxyDetails(cmd, dataFetcher, connection, "tcp", serviceResult, proxyResults)
+		err = displayProxyDetails(cmd, dataFetcher, connection, "tcp", serviceResult, proxyResults, serviceName)
 		if err != nil {
 			return err
 		}
@@ -298,7 +298,7 @@ func getProxyNodeIDs(selectedService string, proxiesSummary config.ProxiesSummar
 	return nodeIDs
 }
 
-func displayProxyDetails(cmd *cobra.Command, dataFetcher fetcher.Fetcher, connection, protocol string, serviceResult, proxyResults []byte) error {
+func displayProxyDetails(cmd *cobra.Command, dataFetcher fetcher.Fetcher, connection, protocol string, serviceResult, proxyResults []byte, service string) error {
 	var (
 		err         error
 		finalResult []byte
@@ -342,7 +342,7 @@ func displayProxyDetails(cmd *cobra.Command, dataFetcher fetcher.Fetcher, connec
 
 	cmd.Print(member + "\n")
 	cmd.Print("--------------------" + header + "\n")
-	value, err = returnGetProxiesDetails(cmd, protocol, dataFetcher, connection)
+	value, err = returnGetProxiesDetails(cmd, protocol, dataFetcher, connection, service)
 	if err != nil {
 		return err
 	}
@@ -352,7 +352,7 @@ func displayProxyDetails(cmd *cobra.Command, dataFetcher fetcher.Fetcher, connec
 	return nil
 }
 
-func returnGetProxiesDetails(cmd *cobra.Command, protocol string, dataFetcher fetcher.Fetcher, connection string) (string, error) {
+func returnGetProxiesDetails(cmd *cobra.Command, protocol string, dataFetcher fetcher.Fetcher, connection string, service string) (string, error) {
 	var sb strings.Builder
 	for {
 		var proxiesSummary = config.ProxiesSummary{}
@@ -384,6 +384,16 @@ func returnGetProxiesDetails(cmd *cobra.Command, protocol string, dataFetcher fe
 			if err != nil {
 				return "", utils.GetError("unable to unmarshall proxy result", err)
 			}
+			if service != "" {
+				// exclude any proxies that don't equal the service name
+				finalProxySummary := make([]config.ProxySummary, 0)
+				for _, v := range proxiesSummary.Proxies {
+					if v.ServiceName == service {
+						finalProxySummary = append(finalProxySummary, v)
+					}
+				}
+				proxiesSummary.Proxies = finalProxySummary
+			}
 			sb.WriteString(FormatProxyServers(proxiesSummary.Proxies, protocol))
 		}
 

pkg/config/config_helper.go

@@ -209,6 +209,7 @@ type ServiceSummary struct {
 	PartitionsEndangered int32  `json:"partitionsEndangered"`
 	PartitionsVulnerable int32  `json:"partitionsVulnerable"`
 	PartitionsUnbalanced int32  `json:"partitionsUnbalanced"`
+	RequestPendingCount  int32  `json:"requestPendingCount"`
 	StorageEnabled       bool   `json:"storageEnabled"`
 	QuorumStatus         string `json:"quorumStatus"`
 	SeniorMemberID       int32  `json:"seniorMemberId"`