Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-1059: If we get an IOException when telling NiFi to shutdown, just kill NiFi immediately, instead of giving up 

Signed-off-by: joewitt <joewitt@apache.org>
This commit is contained in:
Mark Payne 2015-11-25 16:21:58 -05:00 committed by joewitt
parent 9aa9c27dbe
commit 757202b63e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
View File

@ -627,13 +627,14 @@ public class RunNiFi {
final Properties nifiProps = loadProperties(logger); final Properties nifiProps = loadProperties(logger);
final String secretKey = nifiProps.getProperty("secret.key"); final String secretKey = nifiProps.getProperty("secret.key");
final String pid = nifiProps.getProperty("pid");
try (final Socket socket = new Socket()) { try (final Socket socket = new Socket()) {
logger.debug("Connecting to NiFi instance"); logger.debug("Connecting to NiFi instance");
socket.setSoTimeout(60000); socket.setSoTimeout(10000);
socket.connect(new InetSocketAddress("localhost", port)); socket.connect(new InetSocketAddress("localhost", port));
logger.debug("Established connection to NiFi instance."); logger.debug("Established connection to NiFi instance.");
socket.setSoTimeout(60000); socket.setSoTimeout(10000);
logger.debug("Sending SHUTDOWN Command to port {}", port); logger.debug("Sending SHUTDOWN Command to port {}", port);
final OutputStream out = socket.getOutputStream(); final OutputStream out = socket.getOutputStream();
@ -654,7 +655,6 @@ public class RunNiFi {
if (SHUTDOWN_CMD.equals(response)) { if (SHUTDOWN_CMD.equals(response)) {
logger.info("Apache NiFi has accepted the Shutdown Command and is shutting down now"); logger.info("Apache NiFi has accepted the Shutdown Command and is shutting down now");
final String pid = nifiProps.getProperty("pid");
if (pid != null) { if (pid != null) {
final Properties bootstrapProperties = new Properties(); final Properties bootstrapProperties = new Properties();
try (final FileInputStream fis = new FileInputStream(bootstrapConfigFile)) { try (final FileInputStream fis = new FileInputStream(bootstrapConfigFile)) {
@ -703,7 +703,13 @@ public class RunNiFi {
logger.error("When sending SHUTDOWN command to NiFi, got unexpected response {}", response); logger.error("When sending SHUTDOWN command to NiFi, got unexpected response {}", response);
} }
} catch (final IOException ioe) { } catch (final IOException ioe) {
logger.error("Failed to send shutdown command to port {} due to {}", new Object[]{port, ioe.toString(), ioe}); if (pid == null) {
logger.error("Failed to send shutdown command to port {} due to {}. No PID found for the NiFi process, so unable to kill process; "
+ "the process should be killed manually.", new Object[] {port, ioe.toString(), ioe});
} else {
logger.error("Failed to send shutdown command to port {} due to {}. Will kill the NiFi Process with PID {}.", new Object[] {port, ioe.toString(), ioe, pid});
killProcessTree(pid, logger);
}
} finally { } finally {
if (lockFile.exists() && !lockFile.delete()) { if (lockFile.exists() && !lockFile.delete()) {
logger.error("Failed to delete lock file {}; this file should be cleaned up manually", lockFile); logger.error("Failed to delete lock file {}; this file should be cleaned up manually", lockFile);