@@ -101,10 +101,10 @@ func NewCmdBackup() *cobra.Command {
101101 RunE : func (cmd * cobra.Command , args []string ) error {
102102 defer cleanup ()
103103
104- flags .EnsureRequiredFlags (cmd , "appbinding" , "provider" , "secret-dir " )
104+ flags .EnsureRequiredFlags (cmd , "appbinding" , "provider" , "storage- secret-name" , "storage-secret-namespace "
105105
106106 // catch sigkill signals and gracefully terminate so that cleanup functions are executed.
107- sigChan := make (chan os.Signal )
107+ sigChan := make (chan os.Signal , 1 )
108108 signal .Notify (sigChan , os .Interrupt , syscall .SIGTERM )
109109 go func () {
110110 rcvSig := <- sigChan
@@ -180,11 +180,13 @@ func NewCmdBackup() *cobra.Command {
180180 cmd .Flags ().StringVar (& opt .setupOptions .Endpoint , "endpoint" , opt .setupOptions .Endpoint , "Endpoint for s3/s3 compatible backend or REST server URL" )
181181 cmd .Flags ().StringVar (& opt .setupOptions .Region , "region" , opt .setupOptions .Region , "Region for s3/s3 compatible backend" )
182182 cmd .Flags ().StringVar (& opt .setupOptions .Path , "path" , opt .setupOptions .Path , "Directory inside the bucket where backup will be stored" )
183- cmd .Flags ().StringVar (& opt .setupOptions .SecretDir , "secret-dir" , opt .setupOptions .SecretDir , "Directory where storage secret has been mounted" )
184183 cmd .Flags ().StringVar (& opt .setupOptions .ScratchDir , "scratch-dir" , opt .setupOptions .ScratchDir , "Temporary directory" )
185184 cmd .Flags ().BoolVar (& opt .setupOptions .EnableCache , "enable-cache" , opt .setupOptions .EnableCache , "Specify whether to enable caching for restic" )
186185 cmd .Flags ().Int64Var (& opt .setupOptions .MaxConnections , "max-connections" , opt .setupOptions .MaxConnections , "Specify maximum concurrent connections for GCS, Azure and B2 backend" )
187186
187+ cmd .Flags ().StringVar (& opt .storageSecret .Name , "storage-secret-name" , opt .storageSecret .Name , "Name of the storage secret" )
188+ cmd .Flags ().StringVar (& opt .storageSecret .Namespace , "storage-secret-namespace" , opt .storageSecret .Namespace , "Namespace of the storage secret" )
189+ cmd .Flags ().StringVar (& opt .authenticationDatabase , "authentication-database" , "admin" , "Specify the authentication database" )
188190 cmd .Flags ().StringVar (& opt .defaultBackupOptions .Host , "hostname" , opt .defaultBackupOptions .Host , "Name of the host machine" )
189191
190192 cmd .Flags ().Int64Var (& opt .defaultBackupOptions .RetentionPolicy .KeepLast , "retention-keep-last" , opt .defaultBackupOptions .RetentionPolicy .KeepLast , "Specify value for retention strategy" )
@@ -203,6 +205,12 @@ func NewCmdBackup() *cobra.Command {
203205}
204206
205207func (opt * mongoOptions ) backupMongoDB (targetRef api_v1beta1.TargetRef ) (* restic.BackupOutput , error ) {
208+ var err error
209+ opt .setupOptions .StorageSecret , err = opt .kubeClient .CoreV1 ().Secrets (opt .storageSecret .Namespace ).Get (context .TODO (), opt .storageSecret .Name , metav1.GetOptions {})
210+ if err != nil {
211+ return nil , err
212+ }
213+
206214 // if any pre-backup actions has been assigned to it, execute them
207215 actionOptions := api_util.ActionOptions {
208216 StashClient : opt .stashClient ,
@@ -211,7 +219,7 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
211219 BackupSessionName : opt .backupSessionName ,
212220 Namespace : opt .namespace ,
213221 }
214- err : =api_util .ExecutePreBackupActions (actionOptions )
222+ err = api_util .ExecutePreBackupActions (actionOptions )
215223 if err != nil {
216224 return nil , err
217225 }
@@ -230,25 +238,32 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
230238 return nil , err
231239 }
232240
233- // get app binding
234241 appBinding , err := opt .catalogClient .AppcatalogV1alpha1 ().AppBindings (opt .namespace ).Get (context .TODO (), opt .appBindingName , metav1.GetOptions {})
235242 if err != nil {
236243 return nil , err
237244 }
238- // get secret
245+
239246 appBindingSecret , err := opt .kubeClient .CoreV1 ().Secrets (opt .namespace ).Get (context .TODO (), appBinding .Spec .Secret .Name , metav1.GetOptions {})
240247 if err != nil {
241248 return nil , err
242249 }
243250
244- // transform secret
245251 err = appBinding .TransformSecret (opt .kubeClient , appBindingSecret .Data )
246252 if err != nil {
247253 return nil , err
248254 }
249255
250- // wait for DB ready
251- waitForDBReady (appBinding .Spec .ClientConfig .Service .Name , appBinding .Spec .ClientConfig .Service .Port , opt .waitTimeout )
256+ hostname , err := appBinding .Hostname ()
257+ if err != nil {
258+ return nil , err
259+ }
260+
261+ port , err := appBinding .Port ()
262+ if err != nil {
263+ return nil , err
264+ }
265+
266+ waitForDBReady (hostname , port , opt .waitTimeout )
252267
253268 // unmarshal parameter is the field has value
254269 parameters := v1alpha1.MongoDBConfiguration {}
@@ -344,7 +359,7 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
344359 userAuth := []interface {}{
345360 "--username" , string (appBindingSecret .Data [MongoUserKey ]),
346361 "--password" , string (appBindingSecret .Data [MongoPasswordKey ]),
347- "--authenticationDatabase" , "admin" ,
362+ "--authenticationDatabase" , opt . authenticationDatabase ,
348363 }
349364 mongoCreds = append (mongoCreds , userAuth ... )
350365 dumpCreds = append (dumpCreds , userAuth ... )
@@ -370,7 +385,7 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
370385 userArgs := strings .Fields (opt .mongoArgs )
371386
372387 if isStandalone {
373- backupCmd .Args = append (backupCmd .Args , "--port=" + fmt . Sprint ( appBinding . Spec . ClientConfig . Service . Port ))
388+ backupCmd .Args = append (backupCmd .Args , fmt . Sprintf ( "--port=%d" , port ))
374389 } else {
375390 // - port is already added in mongoDSN with replicasetName/host:port format.
376391 // - oplog is enabled automatically for replicasets.
@@ -415,17 +430,16 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
415430
416431 if parameters .ConfigServer != "" {
417432 // sharded cluster. so disable the balancer first. then perform the 'usual' tasks.
418-
419433 primary , secondary , err := getPrimaryNSecondaryMember (parameters .ConfigServer )
420434 if err != nil {
421435 return nil , err
422436 }
423437
424438 // connect to mongos to disable/enable balancer
425- err = disabelBalancer (appBinding . Spec . ClientConfig . Service . Name )
439+ err = disabelBalancer (hostname )
426440 cleanupFuncs = append (cleanupFuncs , func () error {
427441 // even if error occurs, try to enable the balancer on exiting the program.
428- return enableBalancer (appBinding . Spec . ClientConfig . Service . Name )
442+ return enableBalancer (hostname )
429443 })
430444 if err != nil {
431445 return nil , err
@@ -439,14 +453,15 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
439453 }
440454
441455 err = lockConfigServer (parameters .ConfigServer , secondary )
456+
442457 cleanupFuncs = append (cleanupFuncs , func () error {
443458 // even if error occurs, try to unlock the server
444459 return unlockSecondaryMember (secondary )
445460 })
446461 if err != nil {
462+ klog .Errorf ("error while locking config server. error: %v" , err )
447463 return nil , err
448464 }
449-
450465 opt .backupOptions = append (opt .backupOptions , getBackupOpt (backupHost , MongoConfigSVRHostKey , false ))
451466 }
452467
@@ -481,7 +496,7 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
481496 // if parameters.ReplicaSets is nil, then the mongodb database doesn't have replicasets or sharded replicasets.
482497 // In this case, perform normal backup with clientconfig.Service.Name mongo dsn
483498 if parameters .ReplicaSets == nil {
484- opt .backupOptions = append (opt .backupOptions , getBackupOpt (appBinding . Spec . ClientConfig . Service . Name , restic .DefaultHost , true ))
499+ opt .backupOptions = append (opt .backupOptions , getBackupOpt (hostname , restic .DefaultHost , true ))
485500 }
486501
487502 klog .Infoln ("processing backup." )
@@ -493,7 +508,6 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
493508 // hide password, don't print cmd
494509 resticWrapper .HideCMD ()
495510
496- // Run backup
497511 return resticWrapper .RunParallelBackup (opt .backupOptions , targetRef , opt .maxConcurrency )
498512}
499513
@@ -615,12 +629,12 @@ func enableBalancer(mongosHost string) error {
615629
616630func lockConfigServer (configSVRDSN , secondaryHost string ) error {
617631 klog .Infoln ("Attempting to lock configserver" , configSVRDSN )
632+
618633 if secondaryHost == "" {
619634 klog .Warningln ("locking configserver is skipped. secondary host is empty" )
620635 return nil
621636 }
622637 v := make (map [string ]interface {})
623-
624638 // findAndModify BackupControlDocument. skip single quote inside single quote: https://stackoverflow.com/a/28786747/4628962
625639 args := append ([]interface {}{
626640 "config" ,
@@ -631,12 +645,10 @@ func lockConfigServer(configSVRDSN, secondaryHost string) error {
631645 if err := sh .Command (MongoCMD , args ... ).Command ("/usr/bin/tail" , "-1" ).UnmarshalJSON (& v ); err != nil {
632646 return err
633647 }
634-
635648 val , ok := v ["counter" ].(float64 )
636649 if ! ok || int (val ) == 0 {
637650 return fmt .Errorf ("unable to modify BackupControlDocument. got response: %v" , v )
638651 }
639-
640652 val2 := float64 (0 )
641653 timer := 0 // wait approximately 5 minutes.
642654 for timer < 60 && (int (val2 ) == 0 || int (val ) != int (val2 )) {
@@ -646,17 +658,17 @@ func lockConfigServer(configSVRDSN, secondaryHost string) error {
646658 "config" ,
647659 "--host" , secondaryHost ,
648660 "--quiet" ,
649- "--eval" , "rs.slaveOk(); db.BackupControl.find({ '_id' : 'BackupControlDocument' }).readConcern('majority');" ,
650- }, mongoCreds ... )
651- if err := sh .Command (MongoCMD , args ... ).Command ("/usr/bin/tail" , "-1" ).UnmarshalJSON (& v ); err != nil {
661+ "--eval" , "rs.secondaryOk(); db.BackupControl.find({ '_id' : 'BackupControlDocument' }).readConcern('majority');" ,
662+ }, adminCreds ... )
663+
664+ if err := sh .Command (MongoCMD , args ... ).UnmarshalJSON (& v ); err != nil {
652665 return err
653666 }
654667
655668 val2 , ok = v ["counter" ].(float64 )
656669 if ! ok {
657670 return fmt .Errorf ("unable to get BackupControlDocument. got response: %v" , v )
658671 }
659-
660672 if int (val ) != int (val2 ) {
661673 klog .V (5 ).Infof ("BackupDocument counter in secondary is not same. Expected %v, but got %v. Full response: %v" , val , val2 , v )
662674 time .Sleep (time .Second * 5 )
@@ -665,7 +677,6 @@ func lockConfigServer(configSVRDSN, secondaryHost string) error {
665677 if timer >= 60 {
666678 return fmt .Errorf ("timeout while waiting for BackupDocument counter in secondary to be same as primary. Expected %v, but got %v. Full response: %v" , val , val2 , v )
667679 }
668-
669680 // lock secondary
670681 return lockSecondaryMember (secondaryHost )
671682}
0 commit comments