Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add hostname's to stolonctl output #848

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add hostname's to stolonctl output #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/keeper/cmd/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,7 @@ func (p *PostgresKeeper) updateKeeperInfo() error {
UID: keeperUID,
ClusterUID: clusterUID,
BootUUID: p.bootUUID,
Hostname: common.GetHostname(),
PostgresBinaryVersion: cluster.PostgresBinaryVersion{
Maj: maj,
Min: min,
Expand Down
1 change: 1 addition & 0 deletions cmd/proxy/cmd/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ func (c *ClusterChecker) SetProxyInfo(e store.Store, generation int64, proxyTime
InfoUID: common.UID(),
UID: c.uid,
Generation: generation,
Hostname: common.GetHostname(),
ProxyTimeout: proxyTimeout,
}
log.Debugf("proxyInfo dump: %s", spew.Sdump(proxyInfo))
Expand Down
3 changes: 2 additions & 1 deletion cmd/sentinel/cmd/sentinel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ func (s *Sentinel) syncRepl(spec *cluster.ClusterSpec) bool {

func (s *Sentinel) setSentinelInfo(ctx context.Context, ttl time.Duration) error {
sentinelInfo := &cluster.SentinelInfo{
UID: s.uid,
UID: s.uid,
Hostname: common.GetHostname(),
}
log.Debugw("sentinelInfo dump", "sentinelInfo", sentinelInfo)

Expand Down
64 changes: 35 additions & 29 deletions cmd/stolonctl/cmd/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,19 @@ type Status struct {
Proxies []ProxyStatus `json:"proxies"`
Keepers []KeeperStatus `json:"keepers"`
Cluster ClusterStatus `json:"cluster"`
DBs cluster.DBs `json:"-"`
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added for use only once getClusterData(e)
PS: sometimes second getClusterData fail with error 'context deadline exceeded'

}

type SentinelStatus struct {
UID string `json:"uid"`
Leader bool `json:"leader"`
UID string `json:"uid"`
Leader bool `json:"leader"`
Hostname string `json:"hostname"`
}

type ProxyStatus struct {
UID string `json:"uid"`
Generation int64 `json:"generation"`
Hostname string `json:"hostname"`
}

type KeeperStatus struct {
Expand All @@ -70,6 +73,7 @@ type KeeperStatus struct {
PgHealthy bool `json:"pg_healthy"`
PgWantedGeneration int64 `json:"pg_wanted_generation"`
PgCurrentGeneration int64 `json:"pg_current_generation"`
Hostname string `json:"hostname"`
}

type ClusterStatus struct {
Expand Down Expand Up @@ -121,9 +125,9 @@ func renderText(status Status, generateErr error) {
if len(status.Sentinels) == 0 {
stdout("No active sentinels")
} else {
fmt.Fprintf(tabOut, "ID\tLEADER\n")
fmt.Fprintf(tabOut, "ID\tLEADER\tHOSTNAME\n")
for _, s := range status.Sentinels {
fmt.Fprintf(tabOut, "%s\t%t\n", s.UID, s.Leader)
fmt.Fprintf(tabOut, "%s\t%t\t%s\n", s.UID, s.Leader, s.Hostname)
tabOut.Flush()
}
}
Expand All @@ -134,9 +138,9 @@ func renderText(status Status, generateErr error) {
if len(status.Proxies) == 0 {
stdout("No active proxies")
} else {
fmt.Fprintf(tabOut, "ID\n")
fmt.Fprintf(tabOut, "ID\tHOSTNAME\n")
for _, p := range status.Proxies {
fmt.Fprintf(tabOut, "%s\n", p.UID)
fmt.Fprintf(tabOut, "%s\t%s\n", p.UID, p.Hostname)
tabOut.Flush()
}
}
Expand All @@ -148,9 +152,9 @@ func renderText(status Status, generateErr error) {
stdout("No keepers available")
stdout("")
} else {
fmt.Fprintf(tabOut, "UID\tHEALTHY\tPG LISTENADDRESS\tPG HEALTHY\tPG WANTEDGENERATION\tPG CURRENTGENERATION\n")
fmt.Fprintf(tabOut, "UID\tHEALTHY\tPG LISTENADDRESS\tPG HEALTHY\tPG WANTEDGENERATION\tPG CURRENTGENERATION\tHOSTNAME\n")
for _, k := range status.Keepers {
fmt.Fprintf(tabOut, "%s\t%t\t%s\t%t\t%d\t%d\t\n", k.UID, k.Healthy, k.ListenAddress, k.PgHealthy, k.PgWantedGeneration, k.PgCurrentGeneration)
fmt.Fprintf(tabOut, "%s\t%t\t%s\t%t\t%d\t%d\t%s\n", k.UID, k.Healthy, k.ListenAddress, k.PgHealthy, k.PgWantedGeneration, k.PgCurrentGeneration, k.Hostname)
tabOut.Flush()
}
}
Expand All @@ -168,29 +172,20 @@ func renderText(status Status, generateErr error) {
}
}

// This tree data isn't currently available in the Status struct
e, err := cmdcommon.NewStore(&cfg.CommonConfig)
if err != nil {
die("%v", err)
}
cd, _, err := getClusterData(e)
if err != nil {
die("%v", err)
}
if status.Cluster.MasterDBUID != "" {
stdout("")
stdout("===== Keepers/DB tree =====")
stdout("")
printTree(status.Cluster.MasterDBUID, cd, 0, "", true)
printTree(status.Cluster.MasterDBUID, status, 0, "", true)
}
stdout("")
}

func printTree(dbuid string, cd *cluster.ClusterData, level int, prefix string, tail bool) {
func printTree(dbuid string, status Status, level int, prefix string, tail bool) {
// skip not existing db: specified as a follower but not available in the
// cluster spec (this should happen only when doing a stolonctl
// removekeeper)
if _, ok := cd.DBs[dbuid]; !ok {
if _, ok := status.DBs[dbuid]; !ok {
return
}
out := prefix
Expand All @@ -201,12 +196,12 @@ func printTree(dbuid string, cd *cluster.ClusterData, level int, prefix string,
out += "├─"
}
}
out += cd.DBs[dbuid].Spec.KeeperUID
if dbuid == cd.Cluster.Status.Master {
out += status.DBs[dbuid].Spec.KeeperUID
if dbuid == status.Cluster.MasterDBUID {
out += " (master)"
}
stdout(out)
db := cd.DBs[dbuid]
db := status.DBs[dbuid]
followers := db.Spec.Followers
c := len(followers)
for i, f := range followers {
Expand All @@ -217,15 +212,15 @@ func printTree(dbuid string, cd *cluster.ClusterData, level int, prefix string,
linespace := "│ "
if i < c-1 {
if tail {
printTree(f, cd, level+1, prefix+emptyspace, false)
printTree(f, status, level+1, prefix+emptyspace, false)
} else {
printTree(f, cd, level+1, prefix+linespace, false)
printTree(f, status, level+1, prefix+linespace, false)
}
} else {
if tail {
printTree(f, cd, level+1, prefix+emptyspace, true)
printTree(f, status, level+1, prefix+emptyspace, true)
} else {
printTree(f, cd, level+1, prefix+linespace, true)
printTree(f, status, level+1, prefix+linespace, true)
}
}
}
Expand Down Expand Up @@ -260,7 +255,7 @@ func generateStatus() (Status, error) {
sort.Sort(sentinelsInfo)
for _, si := range sentinelsInfo {
leader := lsid != "" && si.UID == lsid
sentinels = append(sentinels, SentinelStatus{UID: si.UID, Leader: leader})
sentinels = append(sentinels, SentinelStatus{UID: si.UID, Leader: leader, Hostname: si.Hostname})
}
status.Sentinels = sentinels

Expand All @@ -273,7 +268,7 @@ func generateStatus() (Status, error) {
proxies := make([]ProxyStatus, 0)
sort.Sort(proxiesInfoSlice)
for _, pi := range proxiesInfoSlice {
proxies = append(proxies, ProxyStatus{UID: pi.UID, Generation: pi.Generation})
proxies = append(proxies, ProxyStatus{UID: pi.UID, Generation: pi.Generation, Hostname: pi.Hostname})
}
status.Proxies = proxies

Expand All @@ -282,6 +277,11 @@ func generateStatus() (Status, error) {
return status, err
}

keeInfo, err := e.GetKeepersInfo(context.TODO())
if err != nil {
keeInfo = map[string]*cluster.KeeperInfo{}
}

keepers := make([]KeeperStatus, 0)
kssKeys := cd.Keepers.SortedKeys()
for _, kuid := range kssKeys {
Expand All @@ -303,13 +303,18 @@ func generateStatus() (Status, error) {
dbListenAddress = fmt.Sprintf("%s:%s", db.Status.ListenAddress, db.Status.Port)
}
}
hostName := ""
if ki, ok := keeInfo[kuid]; ok && ki != nil {
hostName = ki.Hostname
}
keeper := KeeperStatus{
UID: kuid,
ListenAddress: dbListenAddress,
Healthy: k.Status.Healthy,
PgHealthy: pgHealthy,
PgWantedGeneration: pgWantedGeneration,
PgCurrentGeneration: pgCurrentGeneration,
Hostname: hostName,
}
keepers = append(keepers, keeper)
}
Expand All @@ -329,5 +334,6 @@ func generateStatus() (Status, error) {
}
status.Cluster = cluster

status.DBs = cd.DBs
return status, nil
}
6 changes: 5 additions & 1 deletion internal/cluster/member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type KeeperInfo struct {
UID string `json:"uid,omitempty"`
ClusterUID string `json:"clusterUID,omitempty"`
BootUUID string `json:"bootUUID,omitempty"`
Hostname string `json:"hostname,omitempty"`

PostgresBinaryVersion PostgresBinaryVersion `json:"postgresBinaryVersion,omitempty"`

Expand Down Expand Up @@ -127,7 +128,8 @@ func (s SentinelsInfo) Less(i, j int) bool { return s[i].UID < s[j].UID }
func (s SentinelsInfo) Swap(i, j int) { s[i], s[j] = s[j], s[i] }

type SentinelInfo struct {
UID string
UID string
Hostname string `json:"hostname,omitempty"`
}

type ProxyInfo struct {
Expand All @@ -138,6 +140,8 @@ type ProxyInfo struct {
UID string
Generation int64

Hostname string `json:"hostname,omitempty"`

// ProxyTimeout is the current proxyTimeout used by the proxy
// at the time of publishing its state.
// It's used by the sentinel to know for how much time the
Expand Down
23 changes: 21 additions & 2 deletions internal/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@ package common

import (
"fmt"
"github.com/satori/go.uuid"
"io"
"io/ioutil"
"os"
"path"
"reflect"
"strings"

"github.com/satori/go.uuid"
)

const (
Expand All @@ -49,6 +48,10 @@ var Roles = []Role{
RoleStandby,
}

func init() {
setHostname()
}

func UID() string {
u := uuid.NewV4()
return fmt.Sprintf("%x", u[:4])
Expand Down Expand Up @@ -137,3 +140,19 @@ func WriteFileAtomic(filename string, perm os.FileMode, data []byte) error {
return err
})
}

var (
hostname string
)

func GetHostname() string {
return hostname
}

func setHostname() {
var err error
hostname, err = os.Hostname()
if err != nil {
hostname = ""
}
}