Skip to content
This repository was archived by the owner on Mar 28, 2020. It is now read-only.

backup-operator: Support periodically backup (#1841) #2028

Merged
hasbro17 merged 19 commits into from
Feb 18, 2019
Merged

backup-operator: Support periodically backup (#1841) #2028

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d9a739d
backup-operator: Add BackupIntervalInSecond
ukinau Dec 15, 2018
23314d9
backup: Add validation of BackupIntervalInSecond
ukinau Dec 15, 2018
3babc48
backup: Add LastSuccessDate
ukinau Dec 15, 2018
e10633f
backup: Add MaxBackups in BackupPolicy
ukinau Dec 15, 2018
d36d888
backup: Use path without adding info if one-shot
ukinau Dec 17, 2018
31c5f4b
backup: Reset reason if backup succeeded
ukinau Dec 17, 2018
2dc177c
backup: Update the codegen files
ukinau Dec 17, 2018
fce86f1
backup: fix typo
ukinau Dec 17, 2018
d519aa7
backup: Refactoring
ukinau Dec 18, 2018
d1ae2c4
backup: Use meta/v1.Time instead of time.Time
ukinau Dec 18, 2018
7409717
backup: minor fixes (naming, extra space)
ukinau Jan 14, 2019
8737c73
backup: Add periodically backup example
ukinau Jan 14, 2019
e7dfe4b
backup: add e2e slow test for periodic backup
ukinau Jan 15, 2019
1cdb3aa
Update generated k8s code license for new year(2019)
ukinau Jan 15, 2019
ab9b78e
backup: Minor fix "composite literal uses unkeyed"
ukinau Jan 16, 2019
bb3b72c
backup: Update CHANGELOG.md for periodic support
ukinau Jan 16, 2019
e084e9b
backup: Move periodbackup test after restore test
ukinau Feb 9, 2019
aee3c8d
backup: Fixed the bug to get operator in infinite-loop
ukinau Feb 9, 2019
70aa25f
backup: Only Retry in the case of transient error
ukinau Feb 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkg/controller/backup-operator/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,22 @@ func (b *Backup) periodicRunnerFunc(ctx context.Context, t *time.Ticker, eb *api
break
case <-t.C:
var latestEb *api.EtcdBackup
var bs *api.BackupStatus
var err error
for {
for i := 1; i < 6; i++ {
latestEb, err = b.backupCRCli.EtcdV1beta2().EtcdBackups(b.namespace).Get(eb.Name, metav1.GetOptions{})
if err != nil {

@hasbro17 hasbro17 Feb 18, 2019

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ukinau Sorry for the delay. Yes think this should fix the infinite loop.

One more thing that I would improve on this is that we should not retry 5 times if the EtcdBackup CR is deleted or not found because that's when we want to stop the periodic backup. We only want to retry if it's some transient error.

  for i := 1; i < 6; i++ {
    latestEb, err = b.backupCRCli.EtcdV1beta2().EtcdBackups(b.namespace).Get(eb.Name, metav1.GetOptions{})
    if err != nil {
      // Stop backup if CR not found
      if apierrors.IsNotFound(err) {
        b.logger.Infof("Could not find EtcdBackup. Stopping periodic backup for EtcdBackup CR %v",
        eb.Name)
        break
      }
      
      b.logger.Warningf("[Attempt: %d/5] Failed to get latest EtcdBackup %v : (%v)",
        i, eb.Name, err)
      time.Sleep(1)
      continue
    }
    break
  }
  if err == nil {
    // Perform backup
    bs, err = b.handleBackup(&ctx, &latestEb.Spec, true)
  }

But that's just a minor change and since this PR has been out for a while I can make the above change as a follow up if you won't get the time for it anytime soon.

@ukinau ukinau Feb 18, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your review. I'm gonna fix it

b.logger.Warningf("Failed to get latest EtcdBackup %v : (%v)", eb.Name, err)
b.logger.Warningf("[Attempt: %d/5] Failed to get latest EtcdBackup %v : (%v)",
i, eb.Name, err)
time.Sleep(1)
continue
}
break
}
// Perform backup
bs, err := b.handleBackup(&ctx, &latestEb.Spec, true)
if err == nil {
// Perform backup
bs, err = b.handleBackup(&ctx, &latestEb.Spec, true)
}
// Report backup status
b.reportBackupStatus(bs, err, latestEb)
}
Expand Down