Skip to content

Bump mongo-go-driver: v1.17.9 -> v2.6.0 #1314

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

Merged
boris-ilijic merged 7 commits into from
May 7, 2026
Merged

Bump mongo-go-driver: v1.17.9 -> v2.6.0 #1314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21a9f21
Migrate mongo-driver: v1.17.9 -> v2.6.0
boris-ilijic May 1, 2026
4e601e2
Fix writeConcern mapping from conn string
boris-ilijic May 1, 2026
1ba680c
Fix the assertion message while shutting down
boris-ilijic May 1, 2026
3cf04d6
Fix passing raw writeconcern to RunCommand
boris-ilijic May 1, 2026
92cedb3
Fix linter suggestions
boris-ilijic May 4, 2026
6a8fdb1
Merge remote-tracking branch 'origin/dev' into PBM-1592-bump-go-driver
boris-ilijic May 6, 2026
de4bcbf
Fix code formatting and todo items for PBM-1682
boris-ilijic May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 10 additions & 10 deletions cmd/pbm-agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync/atomic"
"time"

"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/mongo"

"github.com/percona/percona-backup-mongodb/pbm/config"
"github.com/percona/percona-backup-mongodb/pbm/connect"
Expand Down Expand Up @@ -115,18 +115,18 @@ func (a *Agent) CanStart(ctx context.Context) error {
func (a *Agent) showIncompatibilityWarning(ctx context.Context) {
if err := version.FeatureSupport(a.brief.Version).PBMSupport(); err != nil {
log.FromContext(ctx).
Warning("", "", "", primitive.Timestamp{}, "WARNING: %v", err)
Warning("", "", "", bson.Timestamp{}, "WARNING: %v", err)
}

if a.brief.Sharded && a.brief.Version.IsShardedTimeseriesSupported() {
tss, err := topo.ListShardedTimeseries(ctx, a.leadConn)
if err != nil {
log.FromContext(ctx).
Error("", "", "", primitive.Timestamp{},
Error("", "", "", bson.Timestamp{},
"failed to list sharded timeseries: %v", err)
} else if len(tss) != 0 {
log.FromContext(ctx).
Warning("", "", "", primitive.Timestamp{},
Warning("", "", "", bson.Timestamp{},
"WARNING: cannot backup following sharded timeseries: %s",
strings.Join(tss, ", "))
}
Expand All @@ -136,11 +136,11 @@ func (a *Agent) showIncompatibilityWarning(ctx context.Context) {
hasConfigShard, err := topo.HasConfigShard(ctx, a.leadConn)
if err != nil {
log.FromContext(ctx).
Error("", "", "", primitive.Timestamp{},
Error("", "", "", bson.Timestamp{},
"failed to check for Config Shard: %v", err)
} else if hasConfigShard {
log.FromContext(ctx).
Warning("", "", "", primitive.Timestamp{},
Warning("", "", "", bson.Timestamp{},
"WARNING: selective backup and restore is not supported with Config Shard")
}
}
Expand Down Expand Up @@ -267,7 +267,7 @@ func (a *Agent) HbIsRun() bool {

func (a *Agent) HbStatus(ctx context.Context) {
logger := log.FromContext(ctx)
l := logger.NewEvent("agentCheckup", "", "", primitive.Timestamp{})
l := logger.NewEvent("agentCheckup", "", "", bson.Timestamp{})
ctx = log.SetLogEventToContext(ctx, l)

nodeVersion, err := version.GetMongoVersion(ctx, a.nodeConn)
Expand All @@ -293,7 +293,7 @@ func (a *Agent) HbStatus(ctx context.Context) {
l.Debug("deleting agent status")
err := topo.RemoveAgentStatus(context.Background(), a.leadConn, hb)
if err != nil {
logger := logger.NewEvent("agentCheckup", "", "", primitive.Timestamp{})
logger := logger.NewEvent("agentCheckup", "", "", bson.Timestamp{})
logger.Error("remove agent heartbeat: %v", err)
}
}()
Expand Down Expand Up @@ -408,7 +408,7 @@ func updateAgentStat(
func (a *Agent) warnIfParallelAgentDetected(
ctx context.Context,
l log.LogEvent,
lastHeartbeat primitive.Timestamp,
lastHeartbeat bson.Timestamp,
) {
s, err := topo.GetAgentStatus(ctx, a.leadConn, a.brief.SetName, a.brief.Me)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions cmd/pbm-agent/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"runtime"
"time"

"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"
"golang.org/x/sync/errgroup"

"github.com/percona/percona-backup-mongodb/pbm/backup"
Expand Down Expand Up @@ -185,7 +185,7 @@ func (a *Agent) DeletePITR(ctx context.Context, d *ctrl.DeletePITRCmd, opid ctrl
return
}

ts := primitive.Timestamp{T: uint32(t.Unix())}
ts := bson.Timestamp{T: uint32(t.Unix())}
l.Info("deleting pitr chunks older than %v", t)
err = a.deletePITRImpl(ctx, ts)
if err != nil {
Expand Down Expand Up @@ -292,7 +292,7 @@ func (a *Agent) Cleanup(ctx context.Context, d *ctrl.CleanupCmd, opid ctrl.OPID,
}
}

func (a *Agent) deletePITRImpl(ctx context.Context, ts primitive.Timestamp) error {
func (a *Agent) deletePITRImpl(ctx context.Context, ts bson.Timestamp) error {
l := log.LogEventFromContext(ctx)

r, err := backup.MakeCleanupInfo(ctx, a.leadConn, ts, "")
Expand Down
6 changes: 3 additions & 3 deletions cmd/pbm-agent/lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"context"

"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"

"github.com/percona/percona-backup-mongodb/pbm/backup"
"github.com/percona/percona-backup-mongodb/pbm/ctrl"
Expand All @@ -25,7 +25,7 @@ func markBcpStale(ctx context.Context, l *lock.Lock, opid string) error {
return nil
}

log.FromContext(ctx).Debug(string(ctrl.CmdBackup), "", opid, primitive.Timestamp{}, "mark stale meta")
log.FromContext(ctx).Debug(string(ctrl.CmdBackup), "", opid, bson.Timestamp{}, "mark stale meta")

return backup.ChangeBackupStateOPID(l.Connect(), opid, defs.StatusError,
"some of pbm-agents were lost during the backup")
Expand All @@ -42,7 +42,7 @@ func markRestoreStale(ctx context.Context, l *lock.Lock, opid string) error {
return nil
}

log.FromContext(ctx).Debug(string(ctrl.CmdRestore), "", opid, primitive.Timestamp{}, "mark stale meta")
log.FromContext(ctx).Debug(string(ctrl.CmdRestore), "", opid, bson.Timestamp{}, "mark stale meta")

return restore.ChangeRestoreStateOPID(ctx, l.Connect(), opid, defs.StatusError,
"some of pbm-agents were lost during the restore")
Expand Down
4 changes: 2 additions & 2 deletions cmd/pbm-agent/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/mongodb/mongo-tools/common/options"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"

"github.com/percona/percona-backup-mongodb/pbm/connect"
"github.com/percona/percona-backup-mongodb/pbm/ctrl"
Expand Down Expand Up @@ -194,7 +194,7 @@ func restoreFinishCommand() *cobra.Command {
string(ctrl.CmdRestore),
restoreName,
"",
primitive.Timestamp{},
bson.Timestamp{},
)

extFinishCmd := &restore.ExtFinishCmd{
Expand Down
6 changes: 3 additions & 3 deletions cmd/pbm-agent/pitr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"maps"
"time"

"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/mongo"

"github.com/percona/percona-backup-mongodb/pbm/backup"
"github.com/percona/percona-backup-mongodb/pbm/config"
Expand Down Expand Up @@ -165,7 +165,7 @@ func (a *Agent) PITR(ctx context.Context) {
for {
select {
case <-a.closeCMD:
l.Debug(string(ctrl.CmdPITR), "", "", primitive.Timestamp{}, "stopping main loop")
l.Debug(string(ctrl.CmdPITR), "", "", bson.Timestamp{}, "stopping main loop")
return
default:
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/pbm-agent/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"context"

"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/mongo"

"github.com/percona/percona-backup-mongodb/pbm/config"
"github.com/percona/percona-backup-mongodb/pbm/ctrl"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pbm-agent/resync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"context"

"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/mongo"
"golang.org/x/sync/errgroup"

"github.com/percona/percona-backup-mongodb/pbm/config"
Expand Down
6 changes: 3 additions & 3 deletions cmd/pbm-agent/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"strings"

"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/mongo"
"go.mongodb.org/mongo-driver/v2/mongo/options"

"github.com/percona/percona-backup-mongodb/pbm/connect"
"github.com/percona/percona-backup-mongodb/pbm/defs"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pbm-speed-test/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/mongo"

"github.com/percona/percona-backup-mongodb/pbm/compress"
"github.com/percona/percona-backup-mongodb/pbm/connect"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pbm-speed-test/speedt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"time"

"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/mongo"

"github.com/percona/percona-backup-mongodb/pbm/compress"
"github.com/percona/percona-backup-mongodb/pbm/errors"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pbm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"time"

"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/mongo"

"github.com/percona/percona-backup-mongodb/pbm/config"
"github.com/percona/percona-backup-mongodb/pbm/connect"
Expand Down
18 changes: 9 additions & 9 deletions cmd/pbm/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"time"

"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"

"github.com/percona/percona-backup-mongodb/pbm/backup"
"github.com/percona/percona-backup-mongodb/pbm/connect"
Expand Down Expand Up @@ -125,7 +125,7 @@ func deleteBackupByName(ctx context.Context, pbm *sdk.Client, d *deleteBcpOpts)
}

func deleteManyBackup(ctx context.Context, pbm *sdk.Client, d *deleteBcpOpts) (sdk.CommandID, error) {
var ts primitive.Timestamp
var ts bson.Timestamp
ts, err := parseOlderThan(d.olderThan)
if err != nil {
return sdk.NoOpID, errors.Wrap(err, "parse --older-than")
Expand Down Expand Up @@ -190,9 +190,9 @@ func deletePITR(
}
}

var until primitive.Timestamp
var until bson.Timestamp
if d.all {
until = primitive.Timestamp{T: uint32(time.Now().UTC().Unix())}
until = bson.Timestamp{T: uint32(time.Now().UTC().Unix())}
} else {
var err error
until, err = parseOlderThan(d.olderThan)
Expand Down Expand Up @@ -329,10 +329,10 @@ func doCleanup(ctx context.Context, conn connect.Client, pbm *sdk.Client, d *cle
return rv, err
}

func parseOlderThan(s string) (primitive.Timestamp, error) {
func parseOlderThan(s string) (bson.Timestamp, error) {
s = strings.TrimSpace(s)
if s == "" {
return primitive.Timestamp{}, errInvalidFormat
return bson.Timestamp{}, errInvalidFormat
}

ts, err := parseTS(s)
Expand All @@ -345,11 +345,11 @@ func parseOlderThan(s string) (primitive.Timestamp, error) {
if errors.Is(err, errInvalidDuration) {
err = errInvalidFormat
}
return primitive.Timestamp{}, err
return bson.Timestamp{}, err
}

unix := time.Now().UTC().Add(-dur).Unix()
return primitive.Timestamp{T: uint32(unix), I: 0}, nil
return bson.Timestamp{T: uint32(unix), I: 0}, nil
}

var errInvalidDuration = errors.New("invalid duration")
Expand Down Expand Up @@ -394,7 +394,7 @@ func printDeleteInfoTo(w io.Writer, backups []backup.BackupMeta, chunks []oplog.
}

type oplogRange struct {
Start, End primitive.Timestamp
Start, End bson.Timestamp
}

oplogRanges := make(map[string][]oplogRange)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pbm/diagnostic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"path/filepath"

"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"

"github.com/percona/percona-backup-mongodb/pbm/backup"
"github.com/percona/percona-backup-mongodb/pbm/errors"
Expand Down
20 changes: 10 additions & 10 deletions cmd/pbm/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"time"

"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"

"github.com/percona/percona-backup-mongodb/pbm/backup"
"github.com/percona/percona-backup-mongodb/pbm/config"
Expand Down Expand Up @@ -447,38 +447,38 @@ func getBaseSnapshotLastWrite(
sh map[string]bool,
rsMap map[string]string,
tl oplog.Timeline,
) (primitive.Timestamp, error) {
bcp, err := backup.GetFirstBackup(ctx, conn, &primitive.Timestamp{T: tl.Start, I: 0})
) (bson.Timestamp, error) {
bcp, err := backup.GetFirstBackup(ctx, conn, &bson.Timestamp{T: tl.Start, I: 0})
if err != nil {
if !errors.Is(err, errors.ErrNotFound) {
return primitive.Timestamp{}, errors.Wrapf(err, "get backup for timeline: %s", tl)
return bson.Timestamp{}, errors.Wrapf(err, "get backup for timeline: %s", tl)
}

return primitive.Timestamp{}, nil
return bson.Timestamp{}, nil
}
if bcp == nil {
return primitive.Timestamp{}, nil
return bson.Timestamp{}, nil
}

ver, err := version.GetMongoVersion(ctx, conn.MongoClient())
if err != nil {
return primitive.Timestamp{}, errors.Wrap(err, "get mongo version")
return bson.Timestamp{}, errors.Wrap(err, "get mongo version")
}
fcv, err := version.GetFCV(ctx, conn.MongoClient())
if err != nil {
return primitive.Timestamp{}, errors.Wrap(err, "get featureCompatibilityVersion")
return bson.Timestamp{}, errors.Wrap(err, "get featureCompatibilityVersion")
}

bcpMatchCluster(bcp, ver.VersionString, fcv, sh, util.MakeRSMapFunc(rsMap), util.MakeReverseRSMapFunc(rsMap))

if bcp.Status != defs.StatusDone {
return primitive.Timestamp{}, nil
return bson.Timestamp{}, nil
}

return bcp.LastWriteTS, nil
}

func splitByBaseSnapshot(lastWrite primitive.Timestamp, tl oplog.Timeline) []pitrRange {
func splitByBaseSnapshot(lastWrite bson.Timestamp, tl oplog.Timeline) []pitrRange {
if lastWrite.IsZero() || (lastWrite.T < tl.Start || lastWrite.T > tl.End) {
return []pitrRange{{Range: tl, NoBaseSnapshot: true}}
}
Expand Down
Loading
Loading