Skip to content

NIFI-15779 Allow error message to appear on controller service ui when service is enabling but not valid #11389

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
NissimShiman wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −34
Open

NIFI-15779 Allow error message to appear on controller service ui when service is enabling but not valid #11389

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
26 changes: 0 additions & 26 deletions .../src/main/java/org/apache/nifi/controller/service/ControllerServiceNotValidException.java
View file
Open in desktop

This file was deleted.

18 changes: 10 additions & 8 deletions ...s/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.nifi.registry.flow.FlowRegistryClientNode;
import org.apache.nifi.registry.flow.mapping.VersionedComponentStateLookup;
import org.apache.nifi.reporting.BulletinRepository;
import org.apache.nifi.reporting.ComponentType;
import org.apache.nifi.reporting.Severity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -281,13 +282,12 @@ public void enableControllerServices(final Collection<ControllerServiceNode> ser

future.get(30, TimeUnit.SECONDS);
logger.debug("{} enabled with state [{}]", controllerServiceNode, controllerServiceNode.getState());
} catch (final ControllerServiceNotValidException e) {
logger.warn("Failed to enable service {} because it is not currently valid", controllerServiceNode);
} catch (Exception e) {
logger.error("Failed to enable {}", controllerServiceNode, e);
if (this.bulletinRepo != null) {
this.bulletinRepo.addBulletin(BulletinFactory.createBulletin("Controller Service",
Severity.ERROR.name(), "Could not start " + controllerServiceNode + " due to " + e));
this.bulletinRepo.addBulletin(BulletinFactory.createBulletin(controllerServiceNode.getProcessGroupIdentifier(),
controllerServiceNode.getIdentifier(), ComponentType.CONTROLLER_SERVICE, controllerServiceNode.getName(),
"Controller Service", Severity.ERROR.name(), "Could not start " + controllerServiceNode + " due to " + e));
}
}
}
Expand Down Expand Up @@ -369,8 +369,9 @@ private void enableControllerServices(final Collection<ControllerServiceNode> se
}

if (this.bulletinRepo != null) {
this.bulletinRepo.addBulletin(BulletinFactory.createBulletin("Controller Service",
Severity.ERROR.name(), "Could not enable " + controllerServiceNode + " due to " + e));
this.bulletinRepo.addBulletin(BulletinFactory.createBulletin(controllerServiceNode.getProcessGroupIdentifier(),
controllerServiceNode.getIdentifier(), ComponentType.CONTROLLER_SERVICE, controllerServiceNode.getName(),
"Controller Service", Severity.ERROR.name(), "Could not enable " + controllerServiceNode + " due to " + e));
}

break;
Expand All @@ -379,8 +380,9 @@ private void enableControllerServices(final Collection<ControllerServiceNode> se
} catch (Exception e) {
logger.error("Failed to enable {}", controllerServiceNode, e);
if (this.bulletinRepo != null) {
this.bulletinRepo.addBulletin(BulletinFactory.createBulletin("Controller Service",
Severity.ERROR.name(), "Could not start " + controllerServiceNode + " due to " + e));
this.bulletinRepo.addBulletin(BulletinFactory.createBulletin(controllerServiceNode.getProcessGroupIdentifier(),
controllerServiceNode.getIdentifier(), ComponentType.CONTROLLER_SERVICE, controllerServiceNode.getName(),
"Controller Service", Severity.ERROR.name(), "Could not start " + controllerServiceNode + " due to " + e));
}
}
}
Expand Down
Loading