Skip to content

NIFI-15891: Connector Asset Sync on Create and Restore #11190

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

Draft
bobpaulin wants to merge 1 commit into
base: main
Choose a base branch
from
+57 −4
Draft

NIFI-15891: Connector Asset Sync on Create and Restore #11190

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
14 changes: 13 additions & 1 deletion ...-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,25 @@ public void verifyCreate(final String connectorId) {

@Override
public void addConnector(final ConnectorNode connector) {
syncFromProvider(connector);
syncAssetsFromProvider(connector);
connectors.put(connector.getIdentifier(), connector);
}

@Override
public void restoreConnector(final ConnectorNode connector) {
connectors.put(connector.getIdentifier(), connector);

// Reconcile asset binaries and working configuration with the provider so that connectors
// restored from the persisted flow do not require an explicit applyUpdate to download
// assets that are missing locally or whose digests are unknown. Provider failures during
// restore must not prevent the connector from being added to the repository, since the
// provider may be temporarily unavailable at startup.
try {
syncAssetsFromProvider(connector);
} catch (final Exception e) {
logger.warn("Failed to synchronize assets from provider for restored {}; continuing without sync", connector, e);
}

logger.debug("Successfully restored {}", connector);
}

Expand Down
47 changes: 44 additions & 3 deletions ...e/src/test/java/org/apache/nifi/components/connector/TestStandardConnectorRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
Expand Down Expand Up @@ -696,10 +698,49 @@ public void testSyncAssetsFromProviderCallsSyncAssetsThenReloads() {

repository.syncAssetsFromProvider(connector);

// Step 1: provider.syncAssets() called
verify(provider).syncAssets("connector-1");
// Step 1: provider.syncAssets() called (also invoked by addConnector, so happens at least twice)
verify(provider, atLeast(2)).syncAssets("connector-1");
// Step 2: provider.load() called to reload updated config (may also have been called during addConnector)
verify(provider, org.mockito.Mockito.atLeastOnce()).load("connector-1");
verify(provider, atLeastOnce()).load("connector-1");
}

@Test
public void testAddConnectorSyncsAssetsFromProvider() {
final ConnectorConfigurationProvider provider = mock(ConnectorConfigurationProvider.class);
when(provider.load("connector-1")).thenReturn(Optional.empty());
final StandardConnectorRepository repository = createRepositoryWithProvider(provider);

final ConnectorNode connector = createSimpleConnectorNode("connector-1", "Test");
repository.addConnector(connector);

verify(provider).syncAssets("connector-1");
verify(provider).load("connector-1");
}

@Test
public void testRestoreConnectorSyncsAssetsFromProvider() {
final ConnectorConfigurationProvider provider = mock(ConnectorConfigurationProvider.class);
when(provider.load("connector-1")).thenReturn(Optional.empty());
final StandardConnectorRepository repository = createRepositoryWithProvider(provider);

final ConnectorNode connector = createSimpleConnectorNode("connector-1", "Test");
repository.restoreConnector(connector);

assertEquals(1, repository.getConnectors().size());
verify(provider).syncAssets("connector-1");
}

@Test
public void testRestoreConnectorTolerantOfProviderFailure() {
final ConnectorConfigurationProvider provider = mock(ConnectorConfigurationProvider.class);
doThrow(new ConnectorConfigurationProviderException("Provider unavailable"))
.when(provider).syncAssets("connector-1");
final StandardConnectorRepository repository = createRepositoryWithProvider(provider);

final ConnectorNode connector = createSimpleConnectorNode("connector-1", "Test");
repository.restoreConnector(connector);

assertEquals(1, repository.getConnectors().size(), "Restore must succeed even if provider sync fails");
}

@Test
Expand Down
Loading