Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit35466fe

Browse files
committed
Merge pull requestsorintlab#170 from sgotti/cleanup_createpgparameters
keeper: cleanup createPGParameters
2 parents2c16b12 +b24401f commit35466fe

File tree

2 files changed

+17
-30
lines changed

2 files changed

+17
-30
lines changed

‎cmd/keeper/keeper.go

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func init() {
107107
cmdKeeper.PersistentFlags().BoolVar(&cfg.debug,"debug",false,"enable debug logging")
108108
}
109109

110-
vardefaultPGParameters= pg.Parameters{
110+
varmandatoryPGParameters= pg.Parameters{
111111
"unix_socket_directories":"/tmp",
112112
"wal_level":"hot_standby",
113113
"wal_keep_segments":"8",
@@ -178,33 +178,37 @@ func (p *PostgresKeeper) getOurReplConnParams() pg.ConnParams {
178178
}
179179

180180
func (p*PostgresKeeper)createPGParameters(followersIDs []string) pg.Parameters {
181-
pgParameters:=p.clusterConfig.PGParameters
181+
parameters:= pg.Parameters{}
182+
// Copy user defined pg parameters
183+
fork,v:=rangep.clusterConfig.PGParameters {
184+
parameters[k]=v
185+
}
182186

183-
//Merge default PGParameters
184-
fork,v:=rangedefaultPGParameters.Copy() {
185-
pgParameters[k]=v
187+
//Add/Replace mandatory PGParameters
188+
fork,v:=rangemandatoryPGParameters {
189+
parameters[k]=v
186190
}
187191

188-
pgParameters["listen_addresses"]=fmt.Sprintf("127.0.0.1,%s",p.pgListenAddress)
189-
pgParameters["port"]=p.pgPort
190-
pgParameters["max_replication_slots"]=strconv.FormatUint(uint64(p.clusterConfig.MaxStandbysPerSender),10)
192+
parameters["listen_addresses"]=fmt.Sprintf("127.0.0.1,%s",p.pgListenAddress)
193+
parameters["port"]=p.pgPort
194+
parameters["max_replication_slots"]=strconv.FormatUint(uint64(p.clusterConfig.MaxStandbysPerSender),10)
191195
// Add some more wal senders, since also the keeper will use them
192-
pgParameters["max_wal_senders"]=strconv.FormatUint(uint64(p.clusterConfig.MaxStandbysPerSender+2),10)
196+
parameters["max_wal_senders"]=strconv.FormatUint(uint64(p.clusterConfig.MaxStandbysPerSender+2),10)
193197

194198
// required by pg_rewind
195199
// if database has data checksum enabled it's ignored
196200
ifp.clusterConfig.UsePGRewind {
197-
pgParameters["wal_log_hints"]="on"
201+
parameters["wal_log_hints"]="on"
198202
}
199203

200204
// Setup synchronous replication
201205
ifp.clusterConfig.SynchronousReplication {
202-
pgParameters["synchronous_standby_names"]=strings.Join(followersIDs,",")
206+
parameters["synchronous_standby_names"]=strings.Join(followersIDs,",")
203207
}else {
204-
pgParameters["synchronous_standby_names"]=""
208+
parameters["synchronous_standby_names"]=""
205209
}
206210

207-
returnpgParameters
211+
returnparameters
208212
}
209213

210214
typePostgresKeeperstruct {

‎pkg/postgresql/postgresql.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,6 @@ type Manager struct {
5555

5656
typeParametersmap[string]string
5757

58-
func (sParameters)Copy()Parameters {
59-
parameters:=Parameters{}
60-
fork,v:=ranges {
61-
parameters[k]=v
62-
}
63-
returnparameters
64-
}
65-
66-
func (sParameters)Set(k,vstring) {
67-
s[k]=v
68-
}
69-
70-
func (sParameters)Get(kstring) (string,bool) {
71-
v,ok:=s[k]
72-
returnv,ok
73-
}
74-
7558
func (sParameters)Equals(isParameters)bool {
7659
returnreflect.DeepEqual(s,is)
7760
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp