Skip to content

NIFI-16104 Fix flaky ConnectorAssetsIT by polling for asset removal #11420

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

Open
pvillard31 wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −9
Open

NIFI-16104 Fix flaky ConnectorAssetsIT by polling for asset removal #11420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions ...sts/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
import org.apache.nifi.web.api.dto.status.ProcessGroupStatusSnapshotDTO;
import org.apache.nifi.web.api.dto.status.ProcessorStatusSnapshotDTO;
import org.apache.nifi.web.api.entity.ActivateControllerServicesEntity;
import org.apache.nifi.web.api.entity.AssetsEntity;
import org.apache.nifi.web.api.entity.ConfigurationStepEntity;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ConnectionStatusEntity;
Expand Down Expand Up @@ -526,6 +527,27 @@ public void waitForConnectorState(final String connectorId, final ConnectorState
}
}

public void waitForAssetRemoved(final String connectorId, final String assetId)
throws NiFiClientException, IOException, InterruptedException {
int iteration = 0;
while (true) {
final AssetsEntity assetsEntity = getConnectorClient().getAssets(connectorId);
final boolean assetStillPresent = assetsEntity.getAssets() != null
&& assetsEntity.getAssets().stream()
.filter(a -> a.getAsset() != null)
.anyMatch(a -> assetId.equals(a.getAsset().getId()));
if (!assetStillPresent) {
return;
}

if (iteration++ % 30 == 0) {
logger.info("Asset with ID {} is still present for Connector {} but waiting for removal.", assetId, connectorId);
}

Thread.sleep(100L);
}
}

public ConnectorEntity drainConnector(final String connectorId) throws NiFiClientException, IOException {
final ConnectorEntity entity = getConnectorClient().getConnector(connectorId);
entity.setDisconnectedNodeAcknowledged(true);
Expand Down
11 changes: 2 additions & 9 deletions ...m-test-suite/src/test/java/org/apache/nifi/tests/system/connectors/ConnectorAssetsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,8 @@ public void testCreateConnectorAndUploadAsset() throws NiFiClientException, IOEx

getClientUtil().waitForConnectorState(connectorId, ConnectorState.STOPPED);

// Verify that the Asset has been removed from the Connector's Assets list
final AssetsEntity assetsAfterRemoval = connectorClient.getAssets(connectorId);
assertNotNull(assetsAfterRemoval);

final boolean assetStillPresent = assetsAfterRemoval.getAssets() != null && assetsAfterRemoval.getAssets().stream()
.filter(a -> a.getAsset() != null)
.anyMatch(a -> uploadedAssetId.equals(a.getAsset().getId()));

assertFalse(assetStillPresent);
// Wait for the Asset to be removed from the Connector's Assets list
getClientUtil().waitForAssetRemoved(connectorId, uploadedAssetId);

// Wait for Connector to stop before attempting to delete it.
getClientUtil().waitForConnectorStopped(connectorAfterApply.getId());
Expand Down
Loading