Add DatabaseHostname to replica options

It is now possible to set a specific database hostname. The default database hostname is set to 'localhost'. Additionally removed the replica options in lrazureblobdriver.go and use replica options from lreplica_drivers/lrs3driver/lrs3driver.go, to have the same code base.

Author: Stefan Röhrbein

strata/cmd/mongo/lreplica_drivers/lrazureblobdriver/lrazureblobdriver.go

@@ -7,26 +7,20 @@ import (
 
 	"github.com/facebookgo/rocks-strata/strata"
 	"github.com/facebookgo/rocks-strata/strata/azureblobstorage"
+	"github.com/facebookgo/rocks-strata/strata/cmd/mongo/lreplica_drivers/lrs3driver"
 	"github.com/facebookgo/rocks-strata/strata/mongo/lreplica"
 )
 
+// AzureBlobOptions define basic options of your azure blob storage
 type AzureBlobOptions struct {
 	Container  string `short:"C" long:"container" description:"Azure Blob Storage container name" required:"true"`
 	BlobPrefix string `short:"p" long:"blob-prefix" description:"Prefix used when storing and retrieving files. Optional" optional:"true"`
 }
 
-// ReplicaOptions are used for commands like backup and restore
-type ReplicaOptions struct {
-	MaxBackgroundCopies int    `long:"max-background-copies" default:"16" description:"Backup and restore actions will use up to this many goroutines to copy files"`
-	Port                int    `long:"port" default:"27017" description:"Backup should look for a mongod instance that is listening on this port"`
-	Username            string `long:"username" description:"If auth is configured, specify the username with admin privileges here"`
-	Password            string `long:"password" description:"Password for the specified user."`
-}
-
 // Options define the common options needed by this strata command
 type Options struct {
-	AzureBlobOptions AzureBlobOptions `group:"Azure Blob Options"`
-	Replica          ReplicaOptions   `group:"Replica Options"`
+	AzureBlobOptions AzureBlobOptions          `group:"Azure Blob Options"`
+	Replica          lrs3driver.ReplicaOptions `group:"Replica Options"`
 }
 
 // DriverFactory implements strata.DriverFactory
@@ -60,6 +54,7 @@ func (factory DriverFactory) Driver() (*strata.Driver, error) {
 
 	replica, err := lreplica.NewLocalReplica(
 		options.Replica.MaxBackgroundCopies,
+		options.Replica.DatabaseHostname,
 		strconv.Itoa(options.Replica.Port),
 		options.Replica.Username,
 		options.Replica.Password,

strata/cmd/mongo/lreplica_drivers/lrldriver/lrldriver.go

@@ -10,19 +10,19 @@ import (
 
 	"github.com/facebookgo/rocks-strata/strata"
 	"github.com/facebookgo/rocks-strata/strata/cmd/mongo/lreplica_drivers/lrs3driver"
-	"github.com/facebookgo/rocks-strata/strata/mongo/lreplica"
 	"github.com/facebookgo/rocks-strata/strata/lstorage"
+	"github.com/facebookgo/rocks-strata/strata/mongo/lreplica"
 )
 
 // FsOptions are common to all commands
 type FsOptions struct {
-	Mountpoint   string `short:"m" long:"mpoint" description:"Mount point name, such as \"~/sbackup\"" default:"~/sbackup"`
+	Mountpoint string `short:"m" long:"mpoint" description:"Mount point name, such as \"~/sbackup\"" default:"~/sbackup"`
 }
 
 // Options define the common options needed by this strata command
 type Options struct {
-	LocalStorage   FsOptions          `group:"Storage Options"`
-	Replica lrs3driver.ReplicaOptions `group:"Replica Options"`
+	LocalStorage FsOptions                 `group:"Storage Options"`
+	Replica      lrs3driver.ReplicaOptions `group:"Replica Options"`
 }
 
 // DriverFactory implements strata.DriverFactory
@@ -46,6 +46,7 @@ func (factory DriverFactory) Driver() (*strata.Driver, error) {
 
 	replica, err := lreplica.NewLocalReplica(
 		options.Replica.MaxBackgroundCopies,
+		options.Replica.DatabaseHostname,
 		strconv.Itoa(options.Replica.Port),
 		options.Replica.Username,
 		options.Replica.Password,

strata/cmd/mongo/lreplica_drivers/lrminiodriver/lrminiodriver.go

@@ -69,6 +69,7 @@ func (factory DriverFactory) Driver() (*strata.Driver, error) {
 
 	replica, err := lreplica.NewLocalReplica(
 		options.Replica.MaxBackgroundCopies,
+		options.Replica.DatabaseHostname,
 		strconv.Itoa(options.Replica.Port),
 		options.Replica.Username,
 		options.Replica.Password,

strata/cmd/mongo/lreplica_drivers/lrs3driver/lrs3driver.go

@@ -27,6 +27,7 @@ type AWSOptions struct {
 
 // ReplicaOptions are used for commands like backup and restore
 type ReplicaOptions struct {
+	DatabaseHostname    string `long:"database-hostname" default:"localhost" description:"Database hostname can be override with a specific hostname in most cases localhost is sufficient"`
 	MaxBackgroundCopies int    `long:"max-background-copies" default:"16" description:"Backup and restore actions will use up to this many goroutines to copy files"`
 	Port                int    `long:"port" default:"27017" description:"Backup should look for a mongod instance that is listening on this port"`
 	Username            string `long:"username" description:"If auth is configured, specify the username with admin privileges here"`
@@ -70,6 +71,7 @@ func (factory DriverFactory) Driver() (*strata.Driver, error) {
 	}
 	replica, err := lreplica.NewLocalReplica(
 		options.Replica.MaxBackgroundCopies,
+		options.Replica.DatabaseHostname,
 		strconv.Itoa(options.Replica.Port),
 		options.Replica.Username,
 		options.Replica.Password,

strata/mongo/lreplica/mock_replica.go

@@ -20,7 +20,7 @@ type mockLocalSessionGetter struct {
 	mongo *mgotest.Server
 }
 
-func (mlsg *mockLocalSessionGetter) get(string, string, string) (*mgo.Session, error) {
+func (mlsg *mockLocalSessionGetter) get(string, string, string, string) (*mgo.Session, error) {
 	return mlsg.mongo.Session(), nil
 }
 

strata/mongo/lreplica/replica.go

@@ -22,14 +22,14 @@ import (
 )
 
 type sessionGetter interface {
-	get(port, username, password string) (*mgo.Session, error)
+	get(databaseHostname, port, username, password string) (*mgo.Session, error)
 }
 
 type localSessionGetter struct{}
 
 // port could be the empty string
-func (l *localSessionGetter) get(port, username, password string) (*mgo.Session, error) {
-	addr := "localhost"
+func (l *localSessionGetter) get(databaseHostname, port, username, password string) (*mgo.Session, error) {
+	addr := databaseHostname
 	if port != "" {
 		addr += ":" + port
 	}
@@ -44,6 +44,7 @@ func (l *localSessionGetter) get(port, username, password string) (*mgo.Session,
 // LocalReplica is a replica where all methods that take a ReplicaID must be
 // run on the host corresponding to ReplicaID
 type LocalReplica struct {
+	databaseHostname    string
 	port                string
 	username            string
 	password            string
@@ -52,10 +53,11 @@ type LocalReplica struct {
 }
 
 // NewLocalReplica constructs a LocalReplica
-func NewLocalReplica(maxBackgroundCopies int, port, username, password string) (*LocalReplica, error) {
+func NewLocalReplica(maxBackgroundCopies int, databaseHostname, port, username, password string) (*LocalReplica, error) {
 	return &LocalReplica{
 		sessionGetter:       &localSessionGetter{},
 		maxBackgroundCopies: maxBackgroundCopies,
+		databaseHostname:    databaseHostname,
 		port:                port,
 		username:            username,
 		password:            password,
@@ -170,7 +172,7 @@ func nestedBsonMapGet(m bson.M, arg string, moreArgs ...string) (interface{}, er
 // TODO(agf): Have a way to pass in tags
 func (r *LocalReplica) CreateSnapshot(replicaID, snapshotID string) (*strata.Snapshot, error) {
 	strata.Log("Getting session for CreateSnapshot()")
-	session, err := r.sessionGetter.get(r.port, r.username, r.password)
+	session, err := r.sessionGetter.get(r.databaseHostname, r.port, r.username, r.password)
 	if err != nil {
 		return nil, err
 	}
@@ -302,3 +304,4 @@ func partialChecksum(filename string) (string, error) {
 	csum, err := strata.PartialChecksum(file, fileinfo.Size())
 	return fmt.Sprintf("%x", csum), err
 }
+