remove start events from operations (#4442)
<!-- PR description--> remove start events from all operations #### Does this PR need a docs update or release note? - [ ] ⛔ No #### Type of change <!--- Please check the type of change your PR introduces: ---> - [ ] 🧹 Tech Debt/Cleanup #### Issue(s) <!-- Can reference multiple issues. Use one of the following "magic words" - "closes, fixes" to auto-close the Github issue. --> * https://github.com/alcionai/corso/issues/4440 #### Test Plan <!-- How will this be tested prior to merging.--> - [ ] 💪 Manual - [ ] ⚡ Unit test
This commit is contained in:
parent
aa66675b83
commit
8e4d320b21
@ -30,13 +30,9 @@ const (
|
|||||||
// Event Keys
|
// Event Keys
|
||||||
RepoInit = "Repo Init"
|
RepoInit = "Repo Init"
|
||||||
RepoConnect = "Repo Connect"
|
RepoConnect = "Repo Connect"
|
||||||
BackupStart = "Backup Start"
|
|
||||||
BackupEnd = "Backup End"
|
BackupEnd = "Backup End"
|
||||||
RestoreStart = "Restore Start"
|
|
||||||
RestoreEnd = "Restore End"
|
RestoreEnd = "Restore End"
|
||||||
ExportStart = "Export Start"
|
|
||||||
ExportEnd = "Export End"
|
ExportEnd = "Export End"
|
||||||
MaintenanceStart = "Maintenance Start"
|
|
||||||
MaintenanceEnd = "Maintenance End"
|
MaintenanceEnd = "Maintenance End"
|
||||||
|
|
||||||
// Event Data Keys
|
// Event Data Keys
|
||||||
|
|||||||
@ -247,15 +247,6 @@ func (op *BackupOperation) Run(ctx context.Context) (err error) {
|
|||||||
"incremental", op.incremental,
|
"incremental", op.incremental,
|
||||||
"disable_assist_backup", op.disableAssistBackup)
|
"disable_assist_backup", op.disableAssistBackup)
|
||||||
|
|
||||||
op.bus.Event(
|
|
||||||
ctx,
|
|
||||||
events.BackupStart,
|
|
||||||
map[string]any{
|
|
||||||
events.StartTime: startTime,
|
|
||||||
events.Service: op.Selectors.Service.String(),
|
|
||||||
events.BackupID: op.Results.BackupID,
|
|
||||||
})
|
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
op.bus.Event(
|
op.bus.Event(
|
||||||
ctx,
|
ctx,
|
||||||
|
|||||||
@ -229,16 +229,6 @@ func (op *ExportOperation) do(
|
|||||||
"backup_snapshot_id", bup.SnapshotID,
|
"backup_snapshot_id", bup.SnapshotID,
|
||||||
"backup_version", bup.Version)
|
"backup_version", bup.Version)
|
||||||
|
|
||||||
op.bus.Event(
|
|
||||||
ctx,
|
|
||||||
events.ExportStart,
|
|
||||||
map[string]any{
|
|
||||||
events.StartTime: start,
|
|
||||||
events.BackupID: op.BackupID,
|
|
||||||
events.BackupCreateTime: bup.CreationTime,
|
|
||||||
events.ExportID: opStats.exportID,
|
|
||||||
})
|
|
||||||
|
|
||||||
observe.Message(ctx, fmt.Sprintf("Discovered %d items in backup %s to export", len(paths), op.BackupID))
|
observe.Message(ctx, fmt.Sprintf("Discovered %d items in backup %s to export", len(paths), op.BackupID))
|
||||||
|
|
||||||
kopiaComplete := observe.MessageWithCompletion(ctx, "Enumerating items in repository")
|
kopiaComplete := observe.MessageWithCompletion(ctx, "Enumerating items in repository")
|
||||||
|
|||||||
@ -57,13 +57,6 @@ func (op *MaintenanceOperation) Run(ctx context.Context) (err error) {
|
|||||||
|
|
||||||
op.Results.StartedAt = time.Now()
|
op.Results.StartedAt = time.Now()
|
||||||
|
|
||||||
op.bus.Event(
|
|
||||||
ctx,
|
|
||||||
events.MaintenanceStart,
|
|
||||||
map[string]any{
|
|
||||||
events.StartTime: op.Results.StartedAt,
|
|
||||||
})
|
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
op.bus.Event(
|
op.bus.Event(
|
||||||
ctx,
|
ctx,
|
||||||
|
|||||||
@ -266,16 +266,6 @@ func (op *RestoreOperation) do(
|
|||||||
"backup_snapshot_id", bup.SnapshotID,
|
"backup_snapshot_id", bup.SnapshotID,
|
||||||
"backup_version", bup.Version)
|
"backup_version", bup.Version)
|
||||||
|
|
||||||
op.bus.Event(
|
|
||||||
ctx,
|
|
||||||
events.RestoreStart,
|
|
||||||
map[string]any{
|
|
||||||
events.StartTime: start,
|
|
||||||
events.BackupID: op.BackupID,
|
|
||||||
events.BackupCreateTime: bup.CreationTime,
|
|
||||||
events.RestoreID: opStats.restoreID,
|
|
||||||
})
|
|
||||||
|
|
||||||
observe.Message(ctx, fmt.Sprintf("Discovered %d items in backup %s to restore", len(paths), op.BackupID))
|
observe.Message(ctx, fmt.Sprintf("Discovered %d items in backup %s to restore", len(paths), op.BackupID))
|
||||||
|
|
||||||
progressBar := observe.MessageWithCompletion(ctx, "Enumerating items in repository")
|
progressBar := observe.MessageWithCompletion(ctx, "Enumerating items in repository")
|
||||||
|
|||||||
@ -367,6 +367,5 @@ func (suite *RestoreOpIntegrationSuite) TestRestore_Run_errorNoBackup() {
|
|||||||
assert.Zero(t, ro.Results.ResourceOwners, "resource owners")
|
assert.Zero(t, ro.Results.ResourceOwners, "resource owners")
|
||||||
assert.Zero(t, ro.Results.BytesRead, "bytes read")
|
assert.Zero(t, ro.Results.BytesRead, "bytes read")
|
||||||
// no restore start, because we'd need to find the backup first.
|
// no restore start, because we'd need to find the backup first.
|
||||||
assert.Equal(t, 0, mb.TimesCalled[events.RestoreStart], "restore-start events")
|
|
||||||
assert.Equal(t, 1, mb.TimesCalled[events.RestoreEnd], "restore-end events")
|
assert.Equal(t, 1, mb.TimesCalled[events.RestoreEnd], "restore-end events")
|
||||||
}
|
}
|
||||||
|
|||||||
@ -226,11 +226,7 @@ func (suite *ExchangeBackupIntgSuite) TestBackup_Run_exchange() {
|
|||||||
assert.Equal(t, bo.Results.ResourceOwners, incBO.Results.ResourceOwners, "incremental backup resource owner")
|
assert.Equal(t, bo.Results.ResourceOwners, incBO.Results.ResourceOwners, "incremental backup resource owner")
|
||||||
assert.NoError(t, incBO.Errors.Failure(), "incremental non-recoverable error", clues.ToCore(bo.Errors.Failure()))
|
assert.NoError(t, incBO.Errors.Failure(), "incremental non-recoverable error", clues.ToCore(bo.Errors.Failure()))
|
||||||
assert.Empty(t, incBO.Errors.Recovered(), "count incremental recoverable/iteration errors")
|
assert.Empty(t, incBO.Errors.Recovered(), "count incremental recoverable/iteration errors")
|
||||||
assert.Equal(t, 1, incMB.TimesCalled[events.BackupStart], "incremental backup-start events")
|
|
||||||
assert.Equal(t, 1, incMB.TimesCalled[events.BackupEnd], "incremental backup-end events")
|
assert.Equal(t, 1, incMB.TimesCalled[events.BackupEnd], "incremental backup-end events")
|
||||||
assert.Equal(t,
|
|
||||||
incMB.CalledWith[events.BackupStart][0][events.BackupID],
|
|
||||||
incBO.Results.BackupID, "incremental backupID pre-declaration")
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -876,11 +872,7 @@ func testExchangeContinuousBackups(suite *ExchangeBackupIntgSuite, toggles contr
|
|||||||
// assert.Equal(t, test.nonMetaItemsWritten, incBO.Results.ItemsWritten, "non meta incremental items write")
|
// assert.Equal(t, test.nonMetaItemsWritten, incBO.Results.ItemsWritten, "non meta incremental items write")
|
||||||
assert.NoError(t, incBO.Errors.Failure(), "incremental non-recoverable error", clues.ToCore(incBO.Errors.Failure()))
|
assert.NoError(t, incBO.Errors.Failure(), "incremental non-recoverable error", clues.ToCore(incBO.Errors.Failure()))
|
||||||
assert.Empty(t, incBO.Errors.Recovered(), "incremental recoverable/iteration errors")
|
assert.Empty(t, incBO.Errors.Recovered(), "incremental recoverable/iteration errors")
|
||||||
assert.Equal(t, 1, incMB.TimesCalled[events.BackupStart], "incremental backup-start events")
|
|
||||||
assert.Equal(t, 1, incMB.TimesCalled[events.BackupEnd], "incremental backup-end events")
|
assert.Equal(t, 1, incMB.TimesCalled[events.BackupEnd], "incremental backup-end events")
|
||||||
assert.Equal(t,
|
|
||||||
incMB.CalledWith[events.BackupStart][0][events.BackupID],
|
|
||||||
bupID, "incremental backupID pre-declaration")
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -224,11 +224,7 @@ func runAndCheckBackup(
|
|||||||
assert.Equal(t, 1, bo.Results.ResourceOwners, "count of resource owners")
|
assert.Equal(t, 1, bo.Results.ResourceOwners, "count of resource owners")
|
||||||
assert.NoError(t, bo.Errors.Failure(), "incremental non-recoverable error", clues.ToCore(bo.Errors.Failure()))
|
assert.NoError(t, bo.Errors.Failure(), "incremental non-recoverable error", clues.ToCore(bo.Errors.Failure()))
|
||||||
assert.Empty(t, bo.Errors.Recovered(), "incremental recoverable/iteration errors")
|
assert.Empty(t, bo.Errors.Recovered(), "incremental recoverable/iteration errors")
|
||||||
assert.Equal(t, 1, mb.TimesCalled[events.BackupStart], "backup-start events")
|
|
||||||
assert.Equal(t, 1, mb.TimesCalled[events.BackupEnd], "backup-end events")
|
assert.Equal(t, 1, mb.TimesCalled[events.BackupEnd], "backup-end events")
|
||||||
assert.Equal(t,
|
|
||||||
mb.CalledWith[events.BackupStart][0][events.BackupID],
|
|
||||||
bo.Results.BackupID, "backupID pre-declaration")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkBackupIsInManifests(
|
func checkBackupIsInManifests(
|
||||||
|
|||||||
@ -801,11 +801,7 @@ func runDriveIncrementalTest(
|
|||||||
|
|
||||||
assert.NoError(t, incBO.Errors.Failure(), "incremental non-recoverable error", clues.ToCore(incBO.Errors.Failure()))
|
assert.NoError(t, incBO.Errors.Failure(), "incremental non-recoverable error", clues.ToCore(incBO.Errors.Failure()))
|
||||||
assert.Empty(t, incBO.Errors.Recovered(), "incremental recoverable/iteration errors")
|
assert.Empty(t, incBO.Errors.Recovered(), "incremental recoverable/iteration errors")
|
||||||
assert.Equal(t, 1, incMB.TimesCalled[events.BackupStart], "incremental backup-start events")
|
|
||||||
assert.Equal(t, 1, incMB.TimesCalled[events.BackupEnd], "incremental backup-end events")
|
assert.Equal(t, 1, incMB.TimesCalled[events.BackupEnd], "incremental backup-end events")
|
||||||
assert.Equal(t,
|
|
||||||
incMB.CalledWith[events.BackupStart][0][events.BackupID],
|
|
||||||
bupID, "incremental backupID pre-declaration")
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -912,11 +908,7 @@ func (suite *OneDriveBackupIntgSuite) TestBackup_Run_oneDriveOwnerMigration() {
|
|||||||
assert.LessOrEqual(t, 2, incBO.Results.ItemsRead, "items read")
|
assert.LessOrEqual(t, 2, incBO.Results.ItemsRead, "items read")
|
||||||
assert.NoError(t, incBO.Errors.Failure(), "non-recoverable error", clues.ToCore(incBO.Errors.Failure()))
|
assert.NoError(t, incBO.Errors.Failure(), "non-recoverable error", clues.ToCore(incBO.Errors.Failure()))
|
||||||
assert.Empty(t, incBO.Errors.Recovered(), "recoverable/iteration errors")
|
assert.Empty(t, incBO.Errors.Recovered(), "recoverable/iteration errors")
|
||||||
assert.Equal(t, 1, incMB.TimesCalled[events.BackupStart], "backup-start events")
|
|
||||||
assert.Equal(t, 1, incMB.TimesCalled[events.BackupEnd], "backup-end events")
|
assert.Equal(t, 1, incMB.TimesCalled[events.BackupEnd], "backup-end events")
|
||||||
assert.Equal(t,
|
|
||||||
incMB.CalledWith[events.BackupStart][0][events.BackupID],
|
|
||||||
incBO.Results.BackupID, "backupID pre-declaration")
|
|
||||||
|
|
||||||
bid := incBO.Results.BackupID
|
bid := incBO.Results.BackupID
|
||||||
bup := &backup.Backup{}
|
bup := &backup.Backup{}
|
||||||
|
|||||||
@ -205,7 +205,6 @@ func runAndCheckRestore(
|
|||||||
assert.NotZero(t, ro.Results.ItemsRead, "count of items read")
|
assert.NotZero(t, ro.Results.ItemsRead, "count of items read")
|
||||||
assert.NotZero(t, ro.Results.BytesRead, "bytes read")
|
assert.NotZero(t, ro.Results.BytesRead, "bytes read")
|
||||||
assert.Equal(t, 1, ro.Results.ResourceOwners, "count of resource owners")
|
assert.Equal(t, 1, ro.Results.ResourceOwners, "count of resource owners")
|
||||||
assert.Equal(t, 1, mb.TimesCalled[events.RestoreStart], "restore-start events")
|
|
||||||
assert.Equal(t, 1, mb.TimesCalled[events.RestoreEnd], "restore-end events")
|
assert.Equal(t, 1, mb.TimesCalled[events.RestoreEnd], "restore-end events")
|
||||||
|
|
||||||
return deets
|
return deets
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user