Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

[PDS-339803] mapAllServersToOrigin accounts for duplicates in map construction #6462

Merged
merged 8 commits into from
Mar 6, 2023

Conversation

ergo14
Copy link
Contributor

@ergo14 ergo14 commented Mar 6, 2023

General

Before this PR:
In #6458, we replaced a code path that collected a stream into a set with a method which constructs a map from that stream without performing de-duplication.
After this PR:
We de-duplicate the stream to avoid exceptions in the CCPI fix codepath.
==COMMIT_MSG==
==COMMIT_MSG==

Priority:
P0
Concerns / possible downsides (what feedback would you like?):
Added more tests than needed really?
Is documentation needed?:
No

Compatibility

Does this PR create any API breaks (e.g. at the Java or HTTP layers) - if so, do we have compatibility?:
No
Does this PR change the persisted format of any data - if so, do we have forward and backward compatibility?:
No
The code in this PR may be part of a blue-green deploy. Can upgrades from previous versions safely coexist? (Consider restarts of blue or green nodes.):
Yes
Does this PR rely on statements being true about other products at a deployment - if so, do we have correct product dependencies on these products (or other ways of verifying that these statements are true)?:
N/A
Does this PR need a schema migration?
N/A

Testing and Correctness

What, if any, assumptions are made about the current state of the world? If they change over time, how will we find out?:
N/A
What was existing testing like? What have you done to improve it?:
Added testing for duplciation
If this PR contains complex concurrent or asynchronous code, is it correct? The onus is on the PR writer to demonstrate this.:
N/A
If this PR involves acquiring locks or other shared resources, how do we ensure that these are always released?:
N/A

Execution

How would I tell this PR works in production? (Metrics, logs, etc.):
This along with a future change should help avoid any unrecoverable badness due to quorum=2
Has the safety of all log arguments been decided correctly?:
N/A
Will this change significantly affect our spending on metrics or logs?:
N/A
How would I tell that this PR does not work in production? (monitors, etc.):
unrecoverable badness due to quorum=2
If this PR does not work as expected, how do I fix that state? Would rollback be straightforward?:
Rollback and recall
If the above plan is more complex than “recall and rollback”, please tag the support PoC here (if it is the end of the week, tag both the current and next PoC):
N/A

Scale

Would this PR be expected to pose a risk at scale? Think of the shopping product at our largest stack.:
N/A
Would this PR be expected to perform a large number of database calls, and/or expensive database calls (e.g., row range scans, concurrent CAS)?:
N/A
Would this PR ever, with time and scale, become the wrong thing to do - and if so, how would we know that we need to do something differently?:
N/A

Development Process

Where should we start reviewing?:

If this PR is in excess of 500 lines excluding versions lock-files, why does it not make sense to split it?:

Please tag any other people who should be aware of this PR:
@jeremyk-91
@sverma30
@raiju

@changelog-app
Copy link

changelog-app bot commented Mar 6, 2023

Generate changelog in changelog/@unreleased

Type

  • Feature
  • Improvement
  • Fix
  • Break
  • Deprecation
  • Manual task
  • Migration

Description

mapAllServersToOrigin accounts for duplicates in map construction

Check the box to generate changelog(s)

  • Generate changelog entry

@Test
public void mapAllServersToOriginFromServerStreamWithUniqueElementsReturnsMapWithAllElementsAndAUniqueValue() {
CassandraServerOrigin origin = CassandraServerOrigin.LAST_KNOWN;
assertThat(CassandraServerOrigin.mapAllServersToOrigin(Set.of(SERVER_1, SERVER_2, SERVER_3), origin))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be Stream.of

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!!


@Test
public void mapAllServersToOriginFromServerSetReturnsMapWithAllSetElementsAsKeysAndAUniqueValue() {
CassandraServerOrigin origin = CassandraServerOrigin.TOKEN_RANGE;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: My style preference here is to generally have the origin be a constant, and have one test that checks that you actually point it at a different target depending on the input. We can discuss.

@@ -33,6 +33,6 @@ public static ImmutableMap<CassandraServer, CassandraServerOrigin> mapAllServers

public static ImmutableMap<CassandraServer, CassandraServerOrigin> mapAllServersToOrigin(
Stream<CassandraServer> servers, CassandraServerOrigin origin) {
return servers.collect(ImmutableMap.toImmutableMap(Function.identity(), _v -> origin));
return servers.distinct().collect(ImmutableMap.toImmutableMap(Function.identity(), _v -> origin));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for safety this introduces a constraint on the first argument to toImmutableMap being injective! but given urgency, let's get this through

@jeremyk-91
Copy link
Contributor

👍 🪨

@ergo14 ergo14 changed the title mapAllServersToOrigin accounts for duplicates in map construction [PDS-339803] mapAllServersToOrigin accounts for duplicates in map construction Mar 6, 2023
@bulldozer-bot bulldozer-bot bot merged commit bde83b0 into develop Mar 6, 2023
@bulldozer-bot bulldozer-bot bot deleted the aaccpi branch March 6, 2023 16:47
@svc-autorelease
Copy link
Collaborator

Released 0.809.0

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants