@@ -100,10 +100,10 @@ func NewCmdBackup() *cobra.Command {
100100 RunE : func (cmd * cobra.Command , args []string ) error {
101101 defer cleanup ()
102102
103- flags .EnsureRequiredFlags (cmd , "appbinding" , "provider" , "secret-dir " )
103+ flags .EnsureRequiredFlags (cmd , "appbinding" , "provider" , "storage- secret-name" , "storage-secret-namespace "
104104
105105 // catch sigkill signals and gracefully terminate so that cleanup functions are executed.
106- sigChan := make (chan os.Signal )
106+ sigChan := make (chan os.Signal , 1 )
107107 signal .Notify (sigChan , os .Interrupt , syscall .SIGTERM )
108108 go func () {
109109 rcvSig := <- sigChan
@@ -179,11 +179,13 @@ func NewCmdBackup() *cobra.Command {
179179 cmd .Flags ().StringVar (& opt .setupOptions .Endpoint , "endpoint" , opt .setupOptions .Endpoint , "Endpoint for s3/s3 compatible backend or REST server URL" )
180180 cmd .Flags ().StringVar (& opt .setupOptions .Region , "region" , opt .setupOptions .Region , "Region for s3/s3 compatible backend" )
181181 cmd .Flags ().StringVar (& opt .setupOptions .Path , "path" , opt .setupOptions .Path , "Directory inside the bucket where backup will be stored" )
182- cmd .Flags ().StringVar (& opt .setupOptions .SecretDir , "secret-dir" , opt .setupOptions .SecretDir , "Directory where storage secret has been mounted" )
183182 cmd .Flags ().StringVar (& opt .setupOptions .ScratchDir , "scratch-dir" , opt .setupOptions .ScratchDir , "Temporary directory" )
184183 cmd .Flags ().BoolVar (& opt .setupOptions .EnableCache , "enable-cache" , opt .setupOptions .EnableCache , "Specify whether to enable caching for restic" )
185184 cmd .Flags ().Int64Var (& opt .setupOptions .MaxConnections , "max-connections" , opt .setupOptions .MaxConnections , "Specify maximum concurrent connections for GCS, Azure and B2 backend" )
186185
186+ cmd .Flags ().StringVar (& opt .storageSecret .Name , "storage-secret-name" , opt .storageSecret .Name , "Name of the storage secret" )
187+ cmd .Flags ().StringVar (& opt .storageSecret .Namespace , "storage-secret-namespace" , opt .storageSecret .Namespace , "Namespace of the storage secret" )
188+ cmd .Flags ().StringVar (& opt .authenticationDatabase , "authentication-database" , "admin" , "Specify the authentication database" )
187189 cmd .Flags ().StringVar (& opt .defaultBackupOptions .Host , "hostname" , opt .defaultBackupOptions .Host , "Name of the host machine" )
188190
189191 cmd .Flags ().Int64Var (& opt .defaultBackupOptions .RetentionPolicy .KeepLast , "retention-keep-last" , opt .defaultBackupOptions .RetentionPolicy .KeepLast , "Specify value for retention strategy" )
@@ -202,6 +204,12 @@ func NewCmdBackup() *cobra.Command {
202204}
203205
204206func (opt * mongoOptions ) backupMongoDB (targetRef api_v1beta1.TargetRef ) (* restic.BackupOutput , error ) {
207+ var err error
208+ opt .setupOptions .StorageSecret , err = opt .kubeClient .CoreV1 ().Secrets (opt .storageSecret .Namespace ).Get (context .TODO (), opt .storageSecret .Name , metav1.GetOptions {})
209+ if err != nil {
210+ return nil , err
211+ }
212+
205213 // if any pre-backup actions has been assigned to it, execute them
206214 actionOptions := api_util.ActionOptions {
207215 StashClient : opt .stashClient ,
@@ -210,7 +218,7 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
210218 BackupSessionName : opt .backupSessionName ,
211219 Namespace : opt .namespace ,
212220 }
213- err : =api_util .ExecutePreBackupActions (actionOptions )
221+ err = api_util .ExecutePreBackupActions (actionOptions )
214222 if err != nil {
215223 return nil , err
216224 }
@@ -229,25 +237,32 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
229237 return nil , err
230238 }
231239
232- // get app binding
233240 appBinding , err := opt .catalogClient .AppcatalogV1alpha1 ().AppBindings (opt .namespace ).Get (context .TODO (), opt .appBindingName , metav1.GetOptions {})
234241 if err != nil {
235242 return nil , err
236243 }
237- // get secret
244+
238245 appBindingSecret , err := opt .kubeClient .CoreV1 ().Secrets (opt .namespace ).Get (context .TODO (), appBinding .Spec .Secret .Name , metav1.GetOptions {})
239246 if err != nil {
240247 return nil , err
241248 }
242249
243- // transform secret
244250 err = appBinding .TransformSecret (opt .kubeClient , appBindingSecret .Data )
245251 if err != nil {
246252 return nil , err
247253 }
248254
249- // wait for DB ready
250- waitForDBReady (appBinding .Spec .ClientConfig .Service .Name , appBinding .Spec .ClientConfig .Service .Port , opt .waitTimeout )
255+ hostname , err := appBinding .Hostname ()
256+ if err != nil {
257+ return nil , err
258+ }
259+
260+ port , err := appBinding .Port ()
261+ if err != nil {
262+ return nil , err
263+ }
264+
265+ waitForDBReady (hostname , port , opt .waitTimeout )
251266
252267 // unmarshal parameter is the field has value
253268 parameters := v1alpha1.MongoDBConfiguration {}
@@ -335,7 +350,7 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
335350 adminCreds = []interface {}{
336351 "--username" , string (appBindingSecret .Data [MongoUserKey ]),
337352 "--password" , string (appBindingSecret .Data [MongoPasswordKey ]),
338- "--authenticationDatabase" , "admin" ,
353+ "--authenticationDatabase" , opt . authenticationDatabase ,
339354 }
340355 }
341356
@@ -359,7 +374,7 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
359374 userArgs := strings .Fields (opt .mongoArgs )
360375
361376 if isStandalone {
362- backupCmd .Args = append (backupCmd .Args , "--port=" + fmt . Sprint ( appBinding . Spec . ClientConfig . Service . Port ))
377+ backupCmd .Args = append (backupCmd .Args , fmt . Sprintf ( "--port=%d" , port ))
363378 } else {
364379 // - port is already added in mongoDSN with replicasetName/host:port format.
365380 // - oplog is enabled automatically for replicasets.
@@ -404,17 +419,16 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
404419
405420 if parameters .ConfigServer != "" {
406421 // sharded cluster. so disable the balancer first. then perform the 'usual' tasks.
407-
408422 primary , secondary , err := getPrimaryNSecondaryMember (parameters .ConfigServer )
409423 if err != nil {
410424 return nil , err
411425 }
412426
413427 // connect to mongos to disable/enable balancer
414- err = disabelBalancer (appBinding . Spec . ClientConfig . Service . Name )
428+ err = disabelBalancer (hostname )
415429 cleanupFuncs = append (cleanupFuncs , func () error {
416430 // even if error occurs, try to enable the balancer on exiting the program.
417- return enableBalancer (appBinding . Spec . ClientConfig . Service . Name )
431+ return enableBalancer (hostname )
418432 })
419433 if err != nil {
420434 return nil , err
@@ -428,14 +442,15 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
428442 }
429443
430444 err = lockConfigServer (parameters .ConfigServer , secondary )
445+
431446 cleanupFuncs = append (cleanupFuncs , func () error {
432447 // even if error occurs, try to unlock the server
433448 return unlockSecondaryMember (secondary )
434449 })
435450 if err != nil {
451+ klog .Errorf ("error while locking config server. error: %v" , err )
436452 return nil , err
437453 }
438-
439454 opt .backupOptions = append (opt .backupOptions , getBackupOpt (backupHost , MongoConfigSVRHostKey , false ))
440455 }
441456
@@ -470,7 +485,7 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
470485 // if parameters.ReplicaSets is nil, then the mongodb database doesn't have replicasets or sharded replicasets.
471486 // In this case, perform normal backup with clientconfig.Service.Name mongo dsn
472487 if parameters .ReplicaSets == nil {
473- opt .backupOptions = append (opt .backupOptions , getBackupOpt (appBinding . Spec . ClientConfig . Service . Name , restic .DefaultHost , true ))
488+ opt .backupOptions = append (opt .backupOptions , getBackupOpt (hostname , restic .DefaultHost , true ))
474489 }
475490
476491 klog .Infoln ("processing backup." )
@@ -482,7 +497,6 @@ func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic
482497 // hide password, don't print cmd
483498 resticWrapper .HideCMD ()
484499
485- // Run backup
486500 return resticWrapper .RunParallelBackup (opt .backupOptions , targetRef , opt .maxConcurrency )
487501}
488502
@@ -604,12 +618,12 @@ func enableBalancer(mongosHost string) error {
604618
605619func lockConfigServer (configSVRDSN , secondaryHost string ) error {
606620 klog .Infoln ("Attempting to lock configserver" , configSVRDSN )
621+
607622 if secondaryHost == "" {
608623 klog .Warningln ("locking configserver is skipped. secondary host is empty" )
609624 return nil
610625 }
611626 v := make (map [string ]interface {})
612-
613627 // findAndModify BackupControlDocument. skip single quote inside single quote: https://stackoverflow.com/a/28786747/4628962
614628 args := append ([]interface {}{
615629 "config" ,
@@ -620,12 +634,10 @@ func lockConfigServer(configSVRDSN, secondaryHost string) error {
620634 if err := sh .Command (MongoCMD , args ... ).Command ("tail" , "-1" ).UnmarshalJSON (& v ); err != nil {
621635 return err
622636 }
623-
624637 val , ok := v ["counter" ].(float64 )
625638 if ! ok || int (val ) == 0 {
626639 return fmt .Errorf ("unable to modify BackupControlDocument. got response: %v" , v )
627640 }
628-
629641 val2 := float64 (0 )
630642 timer := 0 // wait approximately 5 minutes.
631643 for timer < 60 && (int (val2 ) == 0 || int (val ) != int (val2 )) {
@@ -635,8 +647,9 @@ func lockConfigServer(configSVRDSN, secondaryHost string) error {
635647 "config" ,
636648 "--host" , secondaryHost ,
637649 "--quiet" ,
638- "--eval" , "rs.slaveOk (); db.BackupControl.find({ '_id' : 'BackupControlDocument' }).readConcern('majority');" ,
650+ "--eval" , "rs.secondaryOk (); db.BackupControl.find({ '_id' : 'BackupControlDocument' }).readConcern('majority');" ,
639651 }, adminCreds ... )
652+
640653 if err := sh .Command (MongoCMD , args ... ).UnmarshalJSON (& v ); err != nil {
641654 return err
642655 }
@@ -645,7 +658,6 @@ func lockConfigServer(configSVRDSN, secondaryHost string) error {
645658 if ! ok {
646659 return fmt .Errorf ("unable to get BackupControlDocument. got response: %v" , v )
647660 }
648-
649661 if int (val ) != int (val2 ) {
650662 klog .V (5 ).Infof ("BackupDocument counter in secondary is not same. Expected %v, but got %v. Full response: %v" , val , val2 , v )
651663 time .Sleep (time .Second * 5 )
@@ -654,7 +666,6 @@ func lockConfigServer(configSVRDSN, secondaryHost string) error {
654666 if timer >= 60 {
655667 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 )
656668 }
657-
658669 // lock secondary
659670 return lockSecondaryMember (secondaryHost )
660671}
0 commit comments