Skip to content

Commit d3ef274

Browse files
vecerajveceraj
committed
fix format
1 parent f0e0f54 commit d3ef274

File tree

10 files changed

+42
-20
lines changed

10 files changed

+42
-20
lines changed

‎cmd/pbm-agent/restore.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,16 @@ func (a *Agent) Restore(ctx context.Context, r *ctrl.RestoreCmd, opid ctrl.OPID,
164164
numParallelColls := getNumParallelCollsConfig(r.NumParallelColls, cfg.Restore)
165165
numInsertionWorkersPerCol := getNumInsertionWorkersConfig(r.NumInsertionWorkers, cfg.Restore)
166166

167-
rr := restore.New(a.leadConn, a.ccrsConn, a.nodeConn, a.brief, cfg, r.RSMap, numParallelColls, numInsertionWorkersPerCol)
167+
rr := restore.New(
168+
a.leadConn,
169+
a.ccrsConn,
170+
a.nodeConn,
171+
a.brief,
172+
cfg,
173+
r.RSMap,
174+
numParallelColls,
175+
numInsertionWorkersPerCol,
176+
)
168177
if r.OplogTS.IsZero() {
169178
err = rr.Snapshot(ctx, r, opid, bcp)
170179
} else {

‎cmd/pbm/restore.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,20 @@ func runRestore(
165165
}
166166
tdiff := time.Now().Unix() - int64(clusterTime.T)
167167

168-
m, err := doRestore(ctx, conn, ccrsConn, o, numParallelColls, numInsertionWorkers, nss, o.nsFrom, o.nsTo, rsMap, node, outf)
168+
m, err := doRestore(
169+
ctx,
170+
conn,
171+
ccrsConn,
172+
o,
173+
numParallelColls,
174+
numInsertionWorkers,
175+
nss,
176+
o.nsFrom,
177+
o.nsTo,
178+
rsMap,
179+
node,
180+
outf,
181+
)
169182
if err != nil {
170183
return nil, err
171184
}

‎cmd/pbm/status.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ type statusSect struct {
6868
Name string
6969
longName string
7070
Obj fmt.Stringer
71-
f func(ctx context.Context, conn connect.Client, ccrsConn connect.Client) (fmt.Stringer, error)
71+
f func(ctx context.Context, conn, ccrsConn connect.Client) (fmt.Stringer, error)
7272
}
7373

7474
func (f statusSect) String() string {
@@ -115,20 +115,20 @@ func status(
115115
data: []*statusSect{
116116
{
117117
"cluster", "Cluster", nil,
118-
func(ctx context.Context, _ connect.Client, _ connect.Client) (fmt.Stringer, error) {
118+
func(ctx context.Context, _, _ connect.Client) (fmt.Stringer, error) {
119119
return clusterStatus(ctx, pbm, cli.RSConfGetter(curi), opts.priority)
120120
},
121121
},
122122
{"pitr", "PITR incremental backup", nil, getPitrStatus},
123123
{
124124
"running", "Currently running", nil,
125-
func(ctx context.Context, _ connect.Client, _ connect.Client) (fmt.Stringer, error) {
125+
func(ctx context.Context, _, _ connect.Client) (fmt.Stringer, error) {
126126
return getCurrOps(ctx, pbm)
127127
},
128128
},
129129
{
130130
"backups", "Backups", nil,
131-
func(ctx context.Context, conn connect.Client, ccrsConn connect.Client) (fmt.Stringer, error) {
131+
func(ctx context.Context, conn, ccrsConn connect.Client) (fmt.Stringer, error) {
132132
return getStorageStat(ctx, conn, ccrsConn, pbm, rsMap)
133133
},
134134
},
@@ -287,7 +287,7 @@ func (p pitrStat) String() string {
287287
return s
288288
}
289289

290-
func getPitrStatus(ctx context.Context, conn connect.Client, ccrsConn connect.Client) (fmt.Stringer, error) {
290+
func getPitrStatus(ctx context.Context, conn, ccrsConn connect.Client) (fmt.Stringer, error) {
291291
var p pitrStat
292292
var err error
293293
p.InConf, _, err = config.IsPITREnabled(ctx, ccrsConn)
@@ -312,7 +312,7 @@ func getPitrStatus(ctx context.Context, conn connect.Client, ccrsConn connect.Cl
312312
return p, errors.Wrap(err, "check for errors")
313313
}
314314

315-
func getPitrErr(ctx context.Context, conn connect.Client, ccrsConn connect.Client) (string, error) {
315+
func getPitrErr(ctx context.Context, conn, ccrsConn connect.Client) (string, error) {
316316
epch, err := config.GetEpoch(ctx, ccrsConn)
317317
if err != nil {
318318
return "", errors.Wrap(err, "get current epoch")

‎pbm/backup/backup.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type Backup struct {
3737
oplogSlicerInterval time.Duration
3838
}
3939

40-
func New(leadConn connect.Client, ccrsConn connect.Client, conn *mongo.Client, brief topo.NodeBrief, dumpConns int) *Backup {
40+
func New(leadConn, ccrsConn connect.Client, conn *mongo.Client, brief topo.NodeBrief, dumpConns int) *Backup {
4141
return &Backup{
4242
leadConn: leadConn,
4343
ccrsConn: ccrsConn,
@@ -48,7 +48,7 @@ func New(leadConn connect.Client, ccrsConn connect.Client, conn *mongo.Client, b
4848
}
4949
}
5050

51-
func NewPhysical(leadConn connect.Client, ccrsConn connect.Client, conn *mongo.Client, brief topo.NodeBrief) *Backup {
51+
func NewPhysical(leadConn, ccrsConn connect.Client, conn *mongo.Client, brief topo.NodeBrief) *Backup {
5252
return &Backup{
5353
leadConn: leadConn,
5454
ccrsConn: ccrsConn,
@@ -58,7 +58,7 @@ func NewPhysical(leadConn connect.Client, ccrsConn connect.Client, conn *mongo.C
5858
}
5959
}
6060

61-
func NewExternal(leadConn connect.Client, ccrsConn connect.Client, conn *mongo.Client, brief topo.NodeBrief) *Backup {
61+
func NewExternal(leadConn, ccrsConn connect.Client, conn *mongo.Client, brief topo.NodeBrief) *Backup {
6262
return &Backup{
6363
leadConn: leadConn,
6464
ccrsConn: ccrsConn,
@@ -68,7 +68,7 @@ func NewExternal(leadConn connect.Client, ccrsConn connect.Client, conn *mongo.C
6868
}
6969
}
7070

71-
func NewIncremental(leadConn connect.Client, ccrsConn connect.Client, conn *mongo.Client, brief topo.NodeBrief, base bool) *Backup {
71+
func NewIncremental(leadConn, ccrsConn connect.Client, conn *mongo.Client, brief topo.NodeBrief, base bool) *Backup {
7272
return &Backup{
7373
leadConn: leadConn,
7474
ccrsConn: ccrsConn,

‎pbm/backup/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func saveBackupMeta(ctx context.Context, conn connect.Client, meta *BackupMeta)
135135
return err
136136
}
137137

138-
func BackupHB(ctx context.Context, conn connect.Client, ccrsConn connect.Client, bcpName string) error {
138+
func BackupHB(ctx context.Context, conn, ccrsConn connect.Client, bcpName string) error {
139139
ts, err := topo.GetClusterTime(ctx, conn)
140140
if err != nil {
141141
return errors.Wrap(err, "read cluster time")

‎pbm/oplog/oplog.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func findLastOplogTS(ctx context.Context, m *mongo.Client) (primitive.Timestamp,
7777

7878
// IsOplogSlicing checks if PITR slicing is running. It looks for PITR locks
7979
// and returns true if there is at least one not stale.
80-
func IsOplogSlicing(ctx context.Context, conn connect.Client, ccrsConn connect.Client) (bool, error) {
80+
func IsOplogSlicing(ctx context.Context, conn, ccrsConn connect.Client) (bool, error) {
8181
locks, err := lock.GetOpLocks(ctx, ccrsConn, &lock.LockHeader{Type: ctrl.CmdPITR})
8282
if err != nil {
8383
return false, errors.Wrap(err, "get locks")

‎pbm/restore/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func AddRestoreRSMeta(ctx context.Context, m connect.Client, name string, rs Res
207207
return err
208208
}
209209

210-
func RestoreHB(ctx context.Context, m connect.Client, ccrsConn connect.Client, name string) error {
210+
func RestoreHB(ctx context.Context, m, ccrsConn connect.Client, name string) error {
211211
ts, err := topo.GetClusterTime(ctx, m)
212212
if err != nil {
213213
return errors.Wrap(err, "read cluster time")

‎pbm/restore/restore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func converged(
206206
return false, nil
207207
}
208208

209-
func waitForStatus(ctx context.Context, conn connect.Client, ccrsConn connect.Client, name string, status defs.Status) error {
209+
func waitForStatus(ctx context.Context, conn, ccrsConn connect.Client, name string, status defs.Status) error {
210210
tk := time.NewTicker(time.Second * 1)
211211
defer tk.Stop()
212212

‎pbm/topo/agent.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func GetAgentStatus(ctx context.Context, m connect.Client, rs, node string) (Age
157157
}
158158

159159
// AgentStatusGC cleans up stale agent statuses
160-
func AgentStatusGC(ctx context.Context, m connect.Client, ccrsConn connect.Client) error {
160+
func AgentStatusGC(ctx context.Context, m, ccrsConn connect.Client) error {
161161
ct, err := GetClusterTime(ctx, m)
162162
if err != nil {
163163
return errors.Wrap(err, "get cluster time")
@@ -181,7 +181,7 @@ func AgentStatusGC(ctx context.Context, m connect.Client, ccrsConn connect.Clien
181181
}
182182

183183
// ListAgentStatuses returns list of registered agents
184-
func ListAgentStatuses(ctx context.Context, m connect.Client, ccrsConn connect.Client) ([]AgentStat, error) {
184+
func ListAgentStatuses(ctx context.Context, m, ccrsConn connect.Client) ([]AgentStat, error) {
185185
if err := AgentStatusGC(ctx, m, ccrsConn); err != nil {
186186
return nil, errors.Wrap(err, "remove stale statuses")
187187
}
@@ -190,7 +190,7 @@ func ListAgentStatuses(ctx context.Context, m connect.Client, ccrsConn connect.C
190190
}
191191

192192
// ListSteadyAgents returns agents which are in steady state for backup or PITR.
193-
func ListSteadyAgents(ctx context.Context, m connect.Client, ccrsConn connect.Client) ([]AgentStat, error) {
193+
func ListSteadyAgents(ctx context.Context, m, ccrsConn connect.Client) ([]AgentStat, error) {
194194
agents, err := ListAgentStatuses(ctx, m, ccrsConn)
195195
if err != nil {
196196
return nil, errors.Wrap(err, "listing agents")

‎pbm/topo/topo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type AuthUserRoles struct {
3636
DB string `bson:"db" json:"db"`
3737
}
3838

39-
func CheckTopoForBackup(ctx context.Context, m connect.Client, ccrsConn connect.Client, type_ defs.BackupType) error {
39+
func CheckTopoForBackup(ctx context.Context, m, ccrsConn connect.Client, type_ defs.BackupType) error {
4040
members, err := ClusterMembers(ctx, m.MongoClient())
4141
if err != nil {
4242
return errors.Wrap(err, "get cluster members")

0 commit comments

Comments
 (0)