diff --git a/pkg/es/node.go b/pkg/es/node.go index c9f55e0..5ece30a 100644 --- a/pkg/es/node.go +++ b/pkg/es/node.go @@ -113,8 +113,8 @@ func NodeShow(conf *cfg.Config, nodename string) error { } k8snode := info.Attributes["k8s_node_name"] - rank := "none" + adsel, exists := stat.AdaptiveSelection[id] if exists { rank = *adsel.Rank diff --git a/pkg/es/shard.go b/pkg/es/shard.go index faefc1b..8052add 100644 --- a/pkg/es/shard.go +++ b/pkg/es/shard.go @@ -163,16 +163,9 @@ func ShardAllocation(conf *cfg.Config, index string) error { slog.Debug("ES result", "explain", res) - currentNode := res.CurrentNode - table := printer.NewTable(conf, 2, 10) table.Addheaders("shard allocation setting", "value") - roles := make([]string, len(currentNode.Roles)) - for idx, role := range currentNode.Roles { - roles[idx] = role.Name - } - table.Entries = [][]any{ {"Index", index}, {"Current state", res.CurrentState}, @@ -181,7 +174,14 @@ func ShardAllocation(conf *cfg.Config, index string) error { {"Can remain on current node", res.CanRemainOnCurrentNode.Name}, } - if currentNode != nil { + if res.CurrentNode != nil { + currentNode := res.CurrentNode + roles := make([]string, len(currentNode.Roles)) + + for idx, role := range currentNode.Roles { + roles[idx] = role.Name + } + table.Entries = append(table.Entries, [][]any{ {"Current node", currentNode.Name}, {"Current k8s node", currentNode.Attributes["k8s_node_name"]},