scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 18:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

VAULT-27563 CE changes (#27847)

Browse Source 
* VAULT-27563 CE changes

* Missed push
This commit is contained in:
Violet Hynes
2024-07-24 09:11:59 -04:00
committed by GitHub
parent 920c08966c
commit ec399e6226
3 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vault/activity_log.go
View File

@@ -143,7 +143,8 @@ type ActivityLog struct {
// nodeID is the ID to use for all fragments that
// are generated.
// TODO: use secondary ID when available?
// This uses the primary ID as of right now, but
// could be adapted to use a secondary in the future.
nodeID string
// current log fragment (may be nil)
@@ -187,14 +188,6 @@ type ActivityLog struct {
inprocessExport *atomic.Bool
// CensusReportDone is a channel used to signal tests upon successful calls
// to (CensusReporter).Write() in CensusReport.
CensusReportDone chan bool
// CensusReportInterval is the testing configuration for time between
// Write() calls initiated in CensusReport.
CensusReportInterval time.Duration
// clock is used to support manipulating time in unit and integration tests
clock timeutil.Clock
// precomputedQueryWritten receives an element whenever a precomputed query
@@ -214,9 +207,6 @@ type ActivityLogCoreConfig struct {
// Do not start timers to send or persist fragments.
DisableTimers bool
// CensusReportInterval is the testing configuration for time
CensusReportInterval time.Duration
// MinimumRetentionMonths defines the minimum value for retention
MinimumRetentionMonths int
@@ -249,7 +239,6 @@ func NewActivityLog(core *Core, logger log.Logger, view *BarrierView, metrics me
sendCh: make(chan struct{}, 1), // buffered so it can be triggered by fragment size
doneCh: make(chan struct{}, 1),
partialMonthClientTracker: make(map[string]*activity.EntityRecord),
CensusReportInterval: time.Hour * 1,
clock: clock,
currentSegment: segmentInfo{
startTimestamp: 0,
@@ -998,7 +987,7 @@ func (a *ActivityLog) refreshFromStoredLog(ctx context.Context, wg *sync.WaitGro
return nil
}
// This version is used during construction
// SetConfigInit is used during construction
func (a *ActivityLog) SetConfigInit(config activityConfig) {
switch config.Enabled {
case "enable":
@@ -1020,13 +1009,9 @@ func (a *ActivityLog) SetConfigInit(config activityConfig) {
if a.configOverrides.MinimumRetentionMonths > 0 {
a.retentionMonths = a.configOverrides.MinimumRetentionMonths
}
if a.configOverrides.CensusReportInterval > 0 {
a.CensusReportInterval = a.configOverrides.CensusReportInterval
}
}
// This version reacts to user changes
// SetConfig reacts to user changes
func (a *ActivityLog) SetConfig(ctx context.Context, config activityConfig) {
a.l.Lock()
defer a.l.Unlock()
@@ -1946,8 +1931,6 @@ type activityConfig struct {
// Enabled is one of enable, disable, default.
Enabled string `json:"enabled"`
CensusReportInterval time.Duration `json:"census_report_interval"`
}
func defaultActivityConfig() activityConfig {

3
vault/census_manager.go
View File

@@ -40,3 +40,6 @@ func (c *Core) setupCensusManager(ctx context.Context) error {
func (cm *CensusManager) BillingStart() time.Time {
return time.Time{}
}
// StartManualReportingSnapshots is a stub for CE.
func (cm *CensusManager) StartManualReportingSnapshots() {}

4
vault/core.go
View File

@@ -2467,10 +2467,6 @@ func (s standardUnsealStrategy) unseal(ctx context.Context, logger log.Logger, c
if err := c.setupCensusManager(ctx); err != nil {
return err
}
c.StartCensusReports(ctx)
c.StartManualCensusSnapshots()
} else {
brokerLogger := logger.Named("audit")
broker, err := audit.NewBroker(brokerLogger)