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

Jump to bottom

fix: send correlation id as process id in the transfer messages #3387

Merged
merged 2 commits into from
Aug 31, 2023
Merged

fix: send correlation id as process id in the transfer messages #3387

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
224eaf9
fix: send correlation id as process id in the transfer messages
ndr-brt Aug 28, 2023
dc118f6
Break lease on iteration
ndr-brt Aug 28, 2023
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
5 changes: 3 additions & 2 deletions .../src/main/java/org/eclipse/edc/connector/transfer/process/TransferProcessManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ private Boolean checkCompletion(TransferProcess transferProcess) {
var checker = statusCheckerRegistry.resolve(transferProcess.getDataDestination().getType());
if (checker == null) {
monitor.warning(format("No checker found for process %s. The process will not advance to the COMPLETED state.", transferProcess.getId()));
breakLease(transferProcess);
return false;
} else {
var resources = transferProcess.getProvisionedResources();
Expand All @@ -455,7 +456,7 @@ private boolean processCompleting(TransferProcess process) {
var message = TransferCompletionMessage.Builder.newInstance()
.protocol(process.getProtocol())
.counterPartyAddress(process.getConnectorAddress())
.processId(process.getId())
.processId(process.getCorrelationId())
.policy(policyArchive.findPolicyForContract(process.getContractId()))
.build();

Expand Down Expand Up @@ -487,7 +488,7 @@ private boolean processTerminating(TransferProcess process) {
var message = TransferTerminationMessage.Builder.newInstance()
.counterPartyAddress(process.getConnectorAddress())
.protocol(process.getProtocol())
.processId(process.getId())
.processId(process.getCorrelationId())
.policy(policyArchive.findPolicyForContract(process.getContractId()))
.build();

Expand Down
23 changes: 16 additions & 7 deletions .../test/java/org/eclipse/edc/connector/transfer/process/TransferProcessManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,9 @@ void started_shouldNotComplete_whenNoChecker() {
manager.start();

await().untilAsserted(() -> {
verify(transferProcessStore, never()).save(any());
var captor = ArgumentCaptor.forClass(TransferProcess.class);
verify(transferProcessStore).save(captor.capture());
assertThat(captor.getValue().getState()).isEqualTo(STARTED.code());
});
}

Expand All @@ -622,31 +624,38 @@ void started_shouldBreakLeaseIfNotConsumer() {

@Test
void completing_shouldTransitionToCompleted_whenSendingMessageSucceed() {
var process = createTransferProcess(COMPLETING);
var process = createTransferProcessBuilder(COMPLETING).dataRequest(createDataRequestBuilder().id("correlationId").build()).build();
when(transferProcessStore.nextNotLeased(anyInt(), stateIs(COMPLETING.code()))).thenReturn(List.of(process)).thenReturn(emptyList());
when(transferProcessStore.findById(process.getId())).thenReturn(process, process.toBuilder().state(COMPLETING.code()).build());
when(dispatcherRegistry.dispatch(any(), isA(TransferCompletionMessage.class))).thenReturn(completedFuture(StatusResult.success("any")));

manager.start();

await().untilAsserted(() -> {
verify(dispatcherRegistry).dispatch(any(), isA(TransferCompletionMessage.class));
var captor = ArgumentCaptor.forClass(TransferCompletionMessage.class);
verify(dispatcherRegistry).dispatch(eq(Object.class), captor.capture());
var message = captor.getValue();
assertThat(message.getProcessId()).isEqualTo("correlationId");
verify(transferProcessStore, times(RETRY_LIMIT)).save(argThat(p -> p.getState() == COMPLETED.code()));
verify(listener).completed(process);
});
}

@Test
void terminating_shouldTransitionToTerminated_whenMessageSentCorrectly() {
var process = createTransferProcessBuilder(TERMINATING).type(PROVIDER).build();
var process = createTransferProcessBuilder(TERMINATING).type(PROVIDER)
.dataRequest(createDataRequestBuilder().id("correlationId").build()).build();
when(transferProcessStore.nextNotLeased(anyInt(), stateIs(TERMINATING.code()))).thenReturn(List.of(process)).thenReturn(emptyList());
when(transferProcessStore.findById(process.getId())).thenReturn(process, process.toBuilder().state(TERMINATING.code()).build());
when(dispatcherRegistry.dispatch(any(), isA(TransferTerminationMessage.class))).thenReturn(completedFuture(StatusResult.success("any")));

manager.start();

await().untilAsserted(() -> {
verify(dispatcherRegistry).dispatch(any(), isA(TransferTerminationMessage.class));
var captor = ArgumentCaptor.forClass(TransferTerminationMessage.class);
verify(dispatcherRegistry).dispatch(eq(Object.class), captor.capture());
var message = captor.getValue();
assertThat(message.getProcessId()).isEqualTo("correlationId");
verify(transferProcessStore, times(RETRY_LIMIT)).save(argThat(p -> p.getState() == TERMINATED.code()));
verify(listener).terminated(process);
});
Expand Down Expand Up @@ -785,7 +794,6 @@ private TransferProcess.Builder createTransferProcessBuilder(TransferProcessStat
var processId = UUID.randomUUID().toString();
var dataRequest = createDataRequestBuilder()
.processId(processId)
.protocol("protocol")
.connectorAddress("http://an/address")
.build();

Expand All @@ -802,7 +810,8 @@ private DataRequest.Builder createDataRequestBuilder() {
.id(UUID.randomUUID().toString())
.contractId(UUID.randomUUID().toString())
.assetId(UUID.randomUUID().toString())
.destinationType(DESTINATION_TYPE);
.destinationType(DESTINATION_TYPE)
.protocol("protocol");
}

private ProvisionedDataDestinationResource provisionedDataDestinationResource() {
Expand Down
1 change: 1 addition & 0 deletions system-tests/e2e-transfer-test/control-plane/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies {
implementation(project(":extensions:common:vault:vault-filesystem"))
implementation(project(":extensions:common:http"))
implementation(project(":extensions:common:iam:iam-mock"))
implementation(project(":extensions:control-plane:api:control-plane-api"))
implementation(project(":extensions:control-plane:api:management-api"))
implementation(project(":extensions:control-plane:transfer:transfer-data-plane"))
implementation(project(":extensions:data-plane:data-plane-client"))
Expand Down
1 change: 1 addition & 0 deletions system-tests/e2e-transfer-test/data-plane/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ plugins {

dependencies {
implementation(project(":core:data-plane:data-plane-core"))
implementation(project(":extensions:control-plane:api:control-plane-api-client"))
implementation(project(":extensions:data-plane:data-plane-http"))
implementation(project(":extensions:data-plane:data-plane-kafka"))
implementation(project(":extensions:data-plane:data-plane-http-oauth2"))
Expand Down
5 changes: 3 additions & 2 deletions ...transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/AbstractEndToEndTransfer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import static java.time.Duration.ofDays;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.COMPLETED;
import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.STARTED;
import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.TERMINATED;
import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
Expand Down Expand Up @@ -147,7 +148,7 @@ void httpPushDataTransfer() {
var transferProcessId = CONSUMER.requestAsset(PROVIDER, assetId, noPrivateProperty(), destination);
await().atMost(timeout).untilAsserted(() -> {
var state = CONSUMER.getTransferProcessState(transferProcessId);
assertThat(state).isEqualTo(STARTED.name());
assertThat(state).isEqualTo(COMPLETED.name());

given()
.baseUri(CONSUMER.backendService().toString())
Expand All @@ -170,7 +171,7 @@ void httpPushDataTransfer_oauth2Provisioning() {
var transferProcessId = CONSUMER.requestAsset(PROVIDER, assetId, noPrivateProperty(), destination);
await().atMost(timeout).untilAsserted(() -> {
var state = CONSUMER.getTransferProcessState(transferProcessId);
assertThat(state).isEqualTo(STARTED.name());
assertThat(state).isEqualTo(COMPLETED.name());

given()
.baseUri(CONSUMER.backendService().toString())
Expand Down
Loading