From 0ee38fbaded2492482d0a79c19a32d4c11f9a9b7 Mon Sep 17 00:00:00 2001 From: miagilepner Date: Wed, 28 Feb 2024 10:33:43 +0100 Subject: [PATCH] Revert "backport of commit ebe9ccf9c7a6af81977dadda7050bea3501c8d31 (#25624)" (#25687) This reverts commit efeafec0b5b527c8667b897fbd6a8349f2e336c5. --- vault/activity_log.go | 1 - vault/core.go | 5 ----- vault/logical_system_helpers.go | 2 -- 3 files changed, 8 deletions(-) diff --git a/vault/activity_log.go b/vault/activity_log.go index 55a38d738729..461daae920e6 100644 --- a/vault/activity_log.go +++ b/vault/activity_log.go @@ -1454,7 +1454,6 @@ func (c *Core) ResetActivityLog() []*activity.LogFragment { allFragments = append(allFragments, a.standbyFragmentsReceived...) a.standbyFragmentsReceived = make([]*activity.LogFragment, 0) - a.partialMonthClientTracker = make(map[string]*activity.EntityRecord) a.fragmentLock.Unlock() return allFragments } diff --git a/vault/core.go b/vault/core.go index eae52093fca8..80ba6e929d34 100644 --- a/vault/core.go +++ b/vault/core.go @@ -2683,11 +2683,6 @@ func (c *Core) postUnseal(ctx context.Context, ctxCancelFunc context.CancelFunc, if c.systemBackend != nil && c.systemBackend.mfaBackend != nil { c.systemBackend.mfaBackend.usedCodes = cache.New(0, 30*time.Second) } - if c.systemBackend != nil { - // all mounts need to be initialized before activity log reporting - // starts, which happens in the post-unseal functions above. - sysActivityLogReporting(c.systemBackend) - } c.logger.Info("post-unseal setup complete") return nil } diff --git a/vault/logical_system_helpers.go b/vault/logical_system_helpers.go index f9c0e7a3d730..3499762b0162 100644 --- a/vault/logical_system_helpers.go +++ b/vault/logical_system_helpers.go @@ -38,8 +38,6 @@ var ( return nil } - sysActivityLogReporting = func(b *SystemBackend) {} - getSystemSchemas = func() []func() *memdb.TableSchema { return nil } getEGPListResponseKeyInfo = func(*SystemBackend, *namespace.Namespace) map[string]interface{} { return nil }