Skip to content

NIFI-3744 - PutHiveStreaming cleanup null fixes #1698

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

Closed
brosander wants to merge 1 commit into from
Closed

NIFI-3744 - PutHiveStreaming cleanup null fixes #1698

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: 12 additions & 10 deletions .../nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,12 @@ public class PutHiveStreaming extends AbstractProcessor {
protected volatile UserGroupInformation ugi;
protected volatile HiveConf hiveConfig;

protected final AtomicBoolean isInitialized = new AtomicBoolean(false);
protected final AtomicBoolean sendHeartBeat = new AtomicBoolean(false);

protected HiveOptions options;
protected ExecutorService callTimeoutPool;
protected transient Timer heartBeatTimer;
protected AtomicBoolean sendHeartBeat = new AtomicBoolean(false);
protected Map<HiveEndPoint, HiveWriter> allWriters;
protected Map<HiveEndPoint, HiveWriter> allWriters = Collections.emptyMap();


@Override
Expand Down Expand Up @@ -662,17 +661,20 @@ public void cleanup() {
}
}
}
allWriters = Collections.emptyMap();

callTimeoutPool.shutdown();
try {
while (!callTimeoutPool.isTerminated()) {
callTimeoutPool.awaitTermination(options.getCallTimeOut(), TimeUnit.MILLISECONDS);
if (callTimeoutPool != null) {
callTimeoutPool.shutdown();
try {
while (!callTimeoutPool.isTerminated()) {
callTimeoutPool.awaitTermination(options.getCallTimeOut(), TimeUnit.MILLISECONDS);
}
} catch (Throwable t) {
log.warn("shutdown interrupted on " + callTimeoutPool, t);
}
} catch (Throwable t) {
log.warn("shutdown interrupted on " + callTimeoutPool, t);
callTimeoutPool = null;
}

callTimeoutPool = null;
ugi = null;
hiveConfigurator.stopRenewer();
}
Expand Down
2 changes: 1 addition & 1 deletion ...i-hive-processors/src/test/java/org/apache/nifi/processors/hive/TestPutHiveStreaming.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ public void onTriggerWithExceptionOnFlushAndClose() throws Exception {

@Test
public void cleanup() throws Exception {

processor.cleanup();
}

@Test
Expand Down