Skip to content

Commit c484a23

Browse files
authored
Merge pull request sorintlab#712 from sgotti/fix_misspelled_words
*: fix some misspelled words
2 parents 0246e8d + 201b8c0 commit c484a23

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

cmd/keeper/cmd/keeper.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ func (p *PostgresKeeper) postgresKeeperSM(pctx context.Context) {
11061106
return
11071107
}
11081108

1109-
// create postgres parameteres with empty InitPGParameters
1109+
// create postgres parameters with empty InitPGParameters
11101110
pgParameters = p.createPGParameters(db)
11111111
// update pgm postgres parameters
11121112
pgm.SetParameters(pgParameters)
@@ -1176,7 +1176,7 @@ func (p *PostgresKeeper) postgresKeeperSM(pctx context.Context) {
11761176
return
11771177
}
11781178

1179-
// create postgres parameteres with empty InitPGParameters
1179+
// create postgres parameters with empty InitPGParameters
11801180
pgParameters = p.createPGParameters(db)
11811181
// update pgm postgres parameters
11821182
pgm.SetParameters(pgParameters)
@@ -1258,7 +1258,7 @@ func (p *PostgresKeeper) postgresKeeperSM(pctx context.Context) {
12581258
return
12591259
}
12601260

1261-
// create postgres parameteres with empty InitPGParameters
1261+
// create postgres parameters with empty InitPGParameters
12621262
pgParameters = p.createPGParameters(db)
12631263
// update pgm postgres parameters
12641264
pgm.SetParameters(pgParameters)
@@ -1362,7 +1362,7 @@ func (p *PostgresKeeper) postgresKeeperSM(pctx context.Context) {
13621362
return
13631363
}
13641364

1365-
// create postgres parameteres with empty InitPGParameters
1365+
// create postgres parameters with empty InitPGParameters
13661366
pgParameters = p.createPGParameters(db)
13671367
// update pgm postgres parameters
13681368
pgm.SetParameters(pgParameters)
@@ -1422,7 +1422,7 @@ func (p *PostgresKeeper) postgresKeeperSM(pctx context.Context) {
14221422
log.Debugw("db status", "initialized", false, "started", false)
14231423
}
14241424

1425-
// create postgres parameteres
1425+
// create postgres parameters
14261426
pgParameters = p.createPGParameters(db)
14271427
// update pgm postgres parameters
14281428
pgm.SetParameters(pgParameters)
@@ -1735,7 +1735,7 @@ func (p *PostgresKeeper) loadDBLocalState() error {
17351735
return nil
17361736
}
17371737

1738-
// saveDBLocalState saves on disk the dbLocalState and only if successfull
1738+
// saveDBLocalState saves on disk the dbLocalState and only if successful
17391739
// updates the current in memory state
17401740
func (p *PostgresKeeper) saveDBLocalState(dbls *DBLocalState) error {
17411741
sj, err := json.Marshal(dbls)

cmd/sentinel/cmd/sentinel.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ func (s *Sentinel) updateCluster(cd *cluster.ClusterData, pis cluster.ProxiesInf
816816
log.Infow("db failed to initialize", "db", db.UID, "keeper", db.Spec.KeeperUID)
817817
// Empty DBs
818818
newcd.DBs = cluster.DBs{}
819-
// Unset master so another keeper can be choosen
819+
// Unset master so another keeper can be chosen
820820
newcd.Cluster.Status.Master = ""
821821
}
822822
}
@@ -930,7 +930,7 @@ func (s *Sentinel) updateCluster(cd *cluster.ClusterData, pis cluster.ProxiesInf
930930
log.Infow("db failed to initialize", "db", db.UID, "keeper", db.Spec.KeeperUID)
931931
// Empty DBs
932932
newcd.DBs = cluster.DBs{}
933-
// Unset master so another keeper can be choosen
933+
// Unset master so another keeper can be chosen
934934
newcd.Cluster.Status.Master = ""
935935
}
936936
}
@@ -1916,7 +1916,7 @@ func (s *Sentinel) clusterSentinelCheck(pctx context.Context) {
19161916
}
19171917
}
19181918

1919-
// Save the new keeperInfoHistories only on successfull cluster data
1919+
// Save the new keeperInfoHistories only on successful cluster data
19201920
// update or in the next run we'll think that the saved keeperInfo was
19211921
// already applied.
19221922
s.keeperInfoHistories = newKeeperInfoHistories

cmd/sentinel/cmd/sentinel_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ package cmd
1616

1717
import (
1818
"fmt"
19-
"github.com/sorintlab/stolon/internal/timer"
19+
"reflect"
2020
"strconv"
2121
"strings"
2222
"testing"
2323
"time"
2424

25-
"reflect"
26-
27-
"github.com/davecgh/go-spew/spew"
2825
"github.com/sorintlab/stolon/internal/cluster"
2926
"github.com/sorintlab/stolon/internal/common"
27+
"github.com/sorintlab/stolon/internal/timer"
28+
29+
"github.com/davecgh/go-spew/spew"
3030
)
3131

3232
var curUID int
@@ -39,7 +39,7 @@ func TestUpdateCluster(t *testing.T) {
3939
outcd *cluster.ClusterData
4040
err error
4141
}{
42-
// Init phase, also test dbSpec paramaters copied from clusterSpec.
42+
// Init phase, also test dbSpec parameters copied from clusterSpec.
4343
// #0 cluster initialization, no keepers
4444
{
4545
cd: &cluster.ClusterData{
@@ -195,7 +195,7 @@ func TestUpdateCluster(t *testing.T) {
195195
Proxy: &cluster.Proxy{},
196196
},
197197
},
198-
// #2 cluster initialization, more than one keeper, the first will be choosen to be the new master.
198+
// #2 cluster initialization, more than one keeper, the first will be chosen to be the new master.
199199
{
200200
cd: &cluster.ClusterData{
201201
Cluster: &cluster.Cluster{

internal/util/k8s.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func PodName() (string, error) {
4141
}
4242

4343
// NewKubeClientConfig return a kube client config that will by default use an
44-
// in cluster client config or, if not available or overriden an external client
44+
// in cluster client config or, if not available or overridden, an external client
4545
// config using the default client behavior used also by kubectl.
4646
func NewKubeClientConfig(kubeconfigPath, context, namespace string) clientcmd.ClientConfig {
4747
rules := clientcmd.NewDefaultClientConfigLoadingRules()

0 commit comments

Comments
 (0)