Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Creates Skeleton RPC to send global client data to primaries … #29285

Merged
merged 2 commits into from
Jan 3, 2025
Merged

Revert "Creates Skeleton RPC to send global client data to primaries … #29285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4964613
Revert "Creates Skeleton RPC to send global client data to primaries …
divyaac Jan 3, 2025
4f926a4
Run make proto
divyaac Jan 3, 2025
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
73 changes: 30 additions & 43 deletions vault/activity/activity_log.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions vault/activity/activity_log.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ message LogFragment {
// token counts not yet in a log segment,
// indexed by namespace ID
map<string, uint64> non_entity_tokens = 3;

// the cluster id that this fragment originated from
// this is used when a fragment is sent from a secondary
string originating_cluster = 4;
}

// This activity log stores records for both clients with entities
Expand Down
10 changes: 0 additions & 10 deletions vault/activity_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,6 @@ type ActivityLog struct {
// precomputedQueryWritten receives an element whenever a precomputed query
// is written. It's used for unit testing
precomputedQueryWritten chan struct{}

// globalClients tracks the global clients of all the clients in memory
globalClients *activity.LogFragment
}

// These non-persistent configuration options allow us to disable
Expand Down Expand Up @@ -462,9 +459,6 @@ func (a *ActivityLog) saveCurrentSegmentToStorageLocked(ctx context.Context, for
}
a.currentSegment.currentClients.Clients = segmentClients

if a.core.IsPerfSecondary() {
a.sendGlobalClients(ctx)
}
err := a.saveCurrentSegmentInternal(ctx, force)
if err != nil {
// The current fragment(s) have already been placed into the in-memory
Expand Down Expand Up @@ -1733,10 +1727,6 @@ func (a *ActivityLog) createCurrentFragment() {
}
}

func (a *ActivityLog) receivedGlobalClientFragments(fragment *activity.LogFragment) {
a.logger.Trace("received fragment from secondary", "cluster_id", fragment.GetOriginatingCluster())
}

func (a *ActivityLog) receivedFragment(fragment *activity.LogFragment) {
a.logger.Trace("received fragment from standby", "node", fragment.OriginatingNode)

Expand Down
5 changes: 0 additions & 5 deletions vault/activity_log_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,3 @@ import (
func (a *ActivityLog) sendCurrentFragment(ctx context.Context) error {
return nil
}

// sendGlobalClients is a no-op on CE
func (a *ActivityLog) sendGlobalClients(ctx context.Context) error {
return nil
}
Loading