From 6448a4f2af53c241594b5d12eb0d03b18f889eda Mon Sep 17 00:00:00 2001 From: Raman Tenneti Date: Mon, 13 Sep 2021 17:40:07 -0700 Subject: sync: Log repo sync state events as 'data' events. git_trace2_event_log.py: + Added LogDataConfigEvents method to log 'data' events. Sync's current_sync_state and previous_sync_state are logged as 'data' events in the current log. It logs are key/value in the |config| argument. Each key is prefixed with |prefix| argument. The following are sample events that are logged during repo sync. {"event":"data", "sid":"repo-20210914T181545Z-P000330c0/repo-20210914T181545Z-P000330c0", "thread":"MainThread", "time":"2021-09-14T18:16:19.935846Z", "key":"previous_sync_state/repo.syncstate.main.synctime", "value":"2021-09-14T17:27:11.573717Z"} {"event":"data", "sid":"repo-20210914T181545Z-P000330c0/repo-20210914T181545Z-P000330c0", "thread":"MainThread", "time":"2021-09-14T18:16:19.955546Z", "key":"current_sync_state/repo.syncstate.main.synctime", "value":"2021-09-14T18:16:19.935979Z"} tests/test_git_trace2_event_log.py: + Added unit tests sync.py: + Changed logging calls to LogDataConfigEvents. Tested: $ ./run_tests Tested it by running the following command multiple times. $ repo_dev sync -j 20 repo sync has finished successfully Verified config data is looged in trace2 event logs. Bug: [google internal] b/199758376 Change-Id: I75fd830e90c1811ec28510538c99a2632b104e85 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/317823 Reviewed-by: Josh Steadmon Reviewed-by: Xin Li Tested-by: Raman Tenneti --- subcmds/sync.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'subcmds/sync.py') diff --git a/subcmds/sync.py b/subcmds/sync.py index 2a0de0a9..c99b06ca 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -1092,13 +1092,13 @@ later is required to fix a server side protocol bug. sys.exit(1) # Log the previous sync analysis state from the config. - self.git_event_log.LogConfigEvents(mp.config.GetSyncAnalysisStateData(), - 'previous_sync_state') + self.git_event_log.LogDataConfigEvents(mp.config.GetSyncAnalysisStateData(), + 'previous_sync_state') # Update and log with the new sync analysis state. mp.config.UpdateSyncAnalysisState(opt, superproject_logging_data) - self.git_event_log.LogConfigEvents(mp.config.GetSyncAnalysisStateData(), - 'current_sync_state') + self.git_event_log.LogDataConfigEvents(mp.config.GetSyncAnalysisStateData(), + 'current_sync_state') if not opt.quiet: print('repo sync has finished successfully.') -- cgit v1.2.3-54-g00ecf