Change naming of DatabaseHostname to LocalHostname

facebookarchive · Feb 10, 2018 · e121d56 · e121d56
1 parent 34b5a4d
commit e121d56
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/strata/cmd/mongo/lreplica_drivers/lrazureblobdriver/lrazureblobdriver.go b/strata/cmd/mongo/lreplica_drivers/lrazureblobdriver/lrazureblobdriver.go
@@ -54,7 +54,7 @@ func (factory DriverFactory) Driver() (*strata.Driver, error) {
 
 	replica, err := lreplica.NewLocalReplica(
 		options.Replica.MaxBackgroundCopies,
-		options.Replica.DatabaseHostname,
+		options.Replica.LocalHostname,
 		strconv.Itoa(options.Replica.Port),
 		options.Replica.Username,
 		options.Replica.Password,

diff --git a/strata/cmd/mongo/lreplica_drivers/lrldriver/lrldriver.go b/strata/cmd/mongo/lreplica_drivers/lrldriver/lrldriver.go
@@ -46,7 +46,7 @@ func (factory DriverFactory) Driver() (*strata.Driver, error) {
 
 	replica, err := lreplica.NewLocalReplica(
 		options.Replica.MaxBackgroundCopies,
-		options.Replica.DatabaseHostname,
+		options.Replica.LocalHostname,
 		strconv.Itoa(options.Replica.Port),
 		options.Replica.Username,
 		options.Replica.Password,

diff --git a/strata/cmd/mongo/lreplica_drivers/lrminiodriver/lrminiodriver.go b/strata/cmd/mongo/lreplica_drivers/lrminiodriver/lrminiodriver.go
@@ -80,7 +80,7 @@ func (factory DriverFactory) Driver() (*strata.Driver, error) {
 
 	replica, err := lreplica.NewLocalReplica(
 		options.Replica.MaxBackgroundCopies,
-		options.Replica.DatabaseHostname,
+		options.Replica.LocalHostname,
 		strconv.Itoa(options.Replica.Port),
 		options.Replica.Username,
 		options.Replica.Password,

diff --git a/strata/cmd/mongo/lreplica_drivers/lrs3driver/lrs3driver.go b/strata/cmd/mongo/lreplica_drivers/lrs3driver/lrs3driver.go
@@ -27,7 +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"`
+	LocalHostname             	string `long:"local-hostname" default:"localhost" description:"'localhost' or a hostname that is accessible on the local machine via e.g. kubernetes network"`
 	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"`
@@ -72,7 +72,7 @@ func (factory DriverFactory) Driver() (*strata.Driver, error) {
 	}
 	replica, err := lreplica.NewLocalReplica(
 		options.Replica.MaxBackgroundCopies,
-		options.Replica.DatabaseHostname,
+		options.Replica.LocalHostname,
 		strconv.Itoa(options.Replica.Port),
 		options.Replica.Username,
 		options.Replica.Password,

diff --git a/strata/mongo/lreplica/replica.go b/strata/mongo/lreplica/replica.go
@@ -25,14 +25,14 @@ import (
 )
 
 type sessionGetter interface {
-	get(sslAllowInvalidCertificates bool, databaseHostname, port, username, password string) (*mgo.Session, error)
+	get(sslAllowInvalidCertificates bool, localHostname, port, username, password string) (*mgo.Session, error)
 }
 
 type localSessionGetter struct{}
 
 // port could be the empty string
-func (l *localSessionGetter) get(sslAllowInvalidCertificates bool, databaseHostname, port, username, password string) (*mgo.Session, error) {
-	addr := databaseHostname
+func (l *localSessionGetter) get(sslAllowInvalidCertificates bool, localHostname, port, username, password string) (*mgo.Session, error) {
+	addr := localHostname
 	if port != "" {
 		addr += ":" + port
 	}
@@ -68,7 +68,7 @@ func (l *localSessionGetter) get(sslAllowInvalidCertificates bool, databaseHostn
 // 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
+	localHostname            string
 	port                        string
 	username                    string
 	password                    string
@@ -78,11 +78,11 @@ type LocalReplica struct {
 }
 
 // NewLocalReplica constructs a LocalReplica
-func NewLocalReplica(maxBackgroundCopies int, databaseHostname, port, username, password string, sslAllowInvalidCertificates bool) (*LocalReplica, error) {
+func NewLocalReplica(maxBackgroundCopies int, localHostname, port, username, password string, sslAllowInvalidCertificates bool) (*LocalReplica, error) {
 	return &LocalReplica{
 		sessionGetter:               &localSessionGetter{},
 		maxBackgroundCopies:         maxBackgroundCopies,
-		databaseHostname:            databaseHostname,
+		localHostname:            	 localHostname,
 		port:                        port,
 		username:                    username,
 		password:                    password,
@@ -198,7 +198,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.sslAllowInvalidCertificates, r.databaseHostname, r.port, r.username, r.password)
+	session, err := r.sessionGetter.get(r.sslAllowInvalidCertificates, r.localHostname, r.port, r.username, r.password)
 	if err != nil {
 		return nil, err
 	}