[nifi] branch master updated: NIFI-6694 Removed erroneous inclusion of the Hive 3 component on the JDK 8 ja_JP locale build stage on Travis
This is an automated email from the ASF dual-hosted git repository. jstorck pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/master by this push: new 2f3ed5c NIFI-6694 Removed erroneous inclusion of the Hive 3 component on the JDK 8 ja_JP locale build stage on Travis 2f3ed5c is described below commit 2f3ed5c40ce3301493db782d6c6a10b47194e598 Author: Jeff Storck AuthorDate: Mon Sep 30 23:52:13 2019 -0400 NIFI-6694 Removed erroneous inclusion of the Hive 3 component on the JDK 8 ja_JP locale build stage on Travis This closes #3781 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72ae924..14a0da6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ matrix: jdk: openjdk8 script: >- mvn clean install -V -T 1C --pl `find . -type d \( -name "*-nar" -or -name "*-assembly" -or -name "*hive3*" \) -and -not -name "*api-nar" -and -not -name "*hive3*" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` +-pl `find . -type d \( -name "*-nar" -or -name "*-assembly" -or -name "*hive3*" \) -and -not -name "*api-nar" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` -Pcontrib-check,include-grpc -Ddir-only -Dmaven.surefire.arguments="-Duser.language=ja -Duser.region=JP" | grep -v -F -f .travis-output-filters
[nifi] branch master updated: NIFI-6703: This closes #3762. Add Stateless NiFi to CLI NIFI-6703: Fixed extracted nar directory and marked api as experimental
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 61baa41 NIFI-6703: This closes #3762. Add Stateless NiFi to CLI
NIFI-6703: Fixed extracted nar directory and marked api as experimental
61baa41 is described below
commit 61baa41e7b5a86618e5b8773569c4805867f211b
Author: samhjelmfelt
AuthorDate: Mon Sep 23 17:47:29 2019 -0500
NIFI-6703: This closes #3762. Add Stateless NiFi to CLI
NIFI-6703: Fixed extracted nar directory and marked api as experimental
Signed-off-by: Joe Witt
---
nifi-assembly/pom.xml | 11 +
nifi-docker/dockermaven-stateless/Dockerfile | 26 +-
.../dockermaven-stateless/integration-test.sh | 46 ---
nifi-docker/dockermaven-stateless/pom.xml | 13 +-
.../nifi-resources/src/main/resources/bin/nifi.sh | 23 +-
nifi-stateless/README.md | 33 ++-
nifi-stateless/nifi-stateless-assembly/LICENSE | 313 -
nifi-stateless/nifi-stateless-assembly/NOTICE | 144 --
nifi-stateless/nifi-stateless-assembly/pom.xml | 144 --
.../src/main/assembly/dependencies.xml | 32 ---
.../org/apache/nifi/stateless/NiFiStateless.java | 24 +-
nifi-stateless/nifi-stateless-core/pom.xml | 25 ++
nifi-stateless/pom.xml | 1 -
13 files changed, 94 insertions(+), 741 deletions(-)
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 8ce38b5..fb79bb5 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -135,6 +135,17 @@ language governing permissions and limitations under the
License. -->
org.apache.nifi
+nifi-stateless-bootstrap
+1.10.0-SNAPSHOT
+
+
+org.apache.nifi
+nifi-stateless-nar
+1.10.0-SNAPSHOT
+nar
+
+
+org.apache.nifi
nifi-provenance-repository-nar
1.10.0-SNAPSHOT
nar
diff --git a/nifi-docker/dockermaven-stateless/Dockerfile
b/nifi-docker/dockermaven-stateless/Dockerfile
index 9dece1f..536329d 100644
--- a/nifi-docker/dockermaven-stateless/Dockerfile
+++ b/nifi-docker/dockermaven-stateless/Dockerfile
@@ -23,36 +23,20 @@ LABEL maintainer="Apache NiFi "
ARG UID=1000
ARG GID=1000
ARG NIFI_VERSION
-ARG STATELESS_LIB_DIR
+ARG LIB_DIR
ARG WORKING_DIR
ENV NIFI_BASE_DIR /opt/nifi
ENV NIFI_HOME ${NIFI_BASE_DIR}/nifi-current
-
-#Use Maven-Ant until Docker squash is stable
-#COPY $NIFI_BINARY $NIFI_BASE_DIR
-#RUN unzip ${NIFI_BASE_DIR}/nifi-${NIFI_VERSION}-bin.zip -d ${NIFI_BASE_DIR} \
-#&& rm ${NIFI_BASE_DIR}/nifi-${NIFI_VERSION}-bin.zip \
-#&& mv ${NIFI_BASE_DIR}/nifi-${NIFI_VERSION} ${NIFI_HOME}
-#
-#COPY $NIFI_STATELESS_BINARY $NIFI_BASE_DIR
-#RUN unzip ${NIFI_BASE_DIR}/nifi-stateless-${NIFI_VERSION}-bin.zip -d
${NIFI_BASE_DIR} \
-#&& rm ${NIFI_BASE_DIR}/nifi-stateless-${NIFI_VERSION}-bin.zip \
-#&& mv ${NIFI_BASE_DIR}/nifi-stateless-${NIFI_VERSION}/lib
${NIFI_HOME}/stateless-lib \
-#&& rm -r ${NIFI_BASE_DIR}/nifi-stateless-${NIFI_VERSION}
-#
-#RUN java -cp "${NIFI_HOME}/stateless-lib/*"
org.apache.nifi.stateless.NiFiStateless ExtractNars
-#RUN rm -r ${NIFI_HOME}/lib
-
# Setup NiFi user
RUN addgroup -g ${GID} nifi && adduser -s /bin/sh -u ${UID} -G nifi -D nifi
RUN mkdir -p $NIFI_HOME && chown nifi:nifi $NIFI_HOME
-RUN mkdir -p ${NIFI_HOME}/work/ && chown nifi:nifi ${NIFI_HOME}/work/ && chmod
777 ${NIFI_HOME}/work/
+RUN mkdir -p ${NIFI_HOME}/work/stateless-nars && chown nifi:nifi
${NIFI_HOME}/work/stateless-nars && chmod 777 ${NIFI_HOME}/work/stateless-nars
-COPY --chown=nifi:nifi $WORKING_DIR ${NIFI_HOME}/work/
-COPY --chown=nifi:nifi $STATELESS_LIB_DIR ${NIFI_HOME}/stateless-lib/
+COPY --chown=nifi:nifi $WORKING_DIR ${NIFI_HOME}/work
+COPY --chown=nifi:nifi $LIB_DIR ${NIFI_HOME}/lib/
#NiFi's HDFS processors require core-site.xml or hdfs-site.xml to exist on
disk before they can be started...
@@ -75,5 +59,5 @@ EXPOSE 8080
WORKDIR ${NIFI_HOME}
-ENTRYPOINT ["/usr/bin/java", "-cp", "stateless-lib/*",
"org.apache.nifi.stateless.NiFiStateless"]
+ENTRYPOINT ["/usr/bin/java", "-cp", "lib/*",
"org.apache.nifi.stateless.NiFiStateless"]
CMD ["RunOpenwhiskActionServer", "8080"]
\ No newline at end of file
diff --git a/nifi-docker/dockermaven-stateless/integration-test.sh
b/nifi-docker/dockermaven-stateless/integration-test.sh
deleted file mode 100755
index c5c0f7c..000
--- a/nifi-docker/dockermaven-stateless/integration-test.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-#Licensed to the Apache Software Foundation (ASF) under one or more
-#contributor license agreements. See the NOTICE file distributed with
-#this work for additional information
[nifi-minifi-cpp] branch master updated: MINIFICPP-1049 - Fix make docker
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new b95fc10 MINIFICPP-1049 - Fix make docker
b95fc10 is described below
commit b95fc10b8e647f984101095fcb3f4e0153d97185
Author: Daniel Bakai
AuthorDate: Mon Sep 30 20:54:49 2019 +0200
MINIFICPP-1049 - Fix make docker
Signed-off-by: Arpad Boda
This closes #655
---
docker/DockerBuild.sh | 5 -
docker/Dockerfile | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/docker/DockerBuild.sh b/docker/DockerBuild.sh
index 6217a82..8e8e3d6 100755
--- a/docker/DockerBuild.sh
+++ b/docker/DockerBuild.sh
@@ -31,12 +31,13 @@ echo "CMake Source Directory: $CMAKE_SOURCE_DIR"
echo "MiNiFi Package: $MINIFI_SOURCE_CODE"
# Copy the MiNiFi source tree to the Docker working directory before building
+rm -rf $CMAKE_SOURCE_DIR/docker/minificppsource
mkdir -p $CMAKE_SOURCE_DIR/docker/minificppsource
rsync -avr \
--exclude '/*build*' \
--exclude '/*_repository*' \
--exclude '/logs' \
- --exclude '/cmake' \
+ --exclude '/cmake-build-*' \
--exclude '/docker' \
--exclude '.git' \
--exclude '/extensions/expression-language/Parser.cpp' \
@@ -57,3 +58,5 @@ DOCKER_COMMAND="docker build --build-arg UID=$UID_ARG \
apacheminificpp:$MINIFI_VERSION ."
echo "Docker Command: '$DOCKER_COMMAND'"
${DOCKER_COMMAND}
+
+rm -rf $CMAKE_SOURCE_DIR/docker/minificppsource
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7b61c0c..38bcaf7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -76,7 +76,7 @@ ENV MINIFI_HOME
$MINIFI_BASE_DIR/nifi-minifi-cpp-${MINIFI_VERSION}
RUN cd ${MINIFI_BASE_DIR} \
&& mkdir build \
&& cd build \
- && cmake -DOPENSSL_FORCE_SHARED=true -DDISABLE_JEMALLOC=ON
-DSTATIC_BUILD= -DSKIP_TESTS=true -DENABLE_JNI=ON .. \
+ && cmake -DDISABLE_JEMALLOC=ON -DSTATIC_BUILD= -DSKIP_TESTS=true
-DENABLE_JNI=ON .. \
&& make -j8 package \
&& tar -xzvf
${MINIFI_BASE_DIR}/build/nifi-minifi-cpp-${MINIFI_VERSION}-bin.tar.gz -C
${MINIFI_BASE_DIR}
[nifi] branch master updated: NIFI-6589: This closes #3670. Cache results from zookeeper when determining the leader NIFI-6589: Updated CuratorLeaderElectionManager to cache results for no more than 5
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new fbd6200 NIFI-6589: This closes #3670. Cache results from zookeeper
when determining the leader NIFI-6589: Updated CuratorLeaderElectionManager to
cache results for no more than 5 seconds per review feedback
fbd6200 is described below
commit fbd6200ab3e4410fd9cf05f31348ec56a89d5af7
Author: Mark Payne
AuthorDate: Mon Aug 26 11:16:30 2019 -0400
NIFI-6589: This closes #3670. Cache results from zookeeper when determining
the leader
NIFI-6589: Updated CuratorLeaderElectionManager to cache results for no
more than 5 seconds per review feedback
Signed-off-by: Joe Witt
---
.../heartbeat/AbstractHeartbeatMonitor.java| 6 +---
.../coordination/node/NodeClusterCoordinator.java | 3 +-
.../heartbeat/TestAbstractHeartbeatMonitor.java| 2 +-
.../election/CuratorLeaderElectionManager.java | 39 ++
.../nifi/integration/parameters/ParametersIT.java | 2 ++
.../web/StandardNiFiWebConfigurationContext.java | 10 +++---
6 files changed, 42 insertions(+), 20 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
index 5fbe3f8..86b4cc1 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
@@ -111,9 +111,6 @@ public abstract class AbstractHeartbeatMonitor implements
HeartbeatMonitor {
return clusterCoordinator;
}
-protected long getHeartbeatInterval(final TimeUnit timeUnit) {
-return timeUnit.convert(heartbeatIntervalMillis,
TimeUnit.MILLISECONDS);
-}
/**
* Fetches all of the latest heartbeats and updates the Cluster Coordinator
@@ -122,8 +119,7 @@ public abstract class AbstractHeartbeatMonitor implements
HeartbeatMonitor {
* Visible for testing.
*/
protected synchronized void monitorHeartbeats() {
-final NodeIdentifier activeCoordinator =
clusterCoordinator.getElectedActiveCoordinatorNode();
-if (activeCoordinator != null &&
!activeCoordinator.equals(clusterCoordinator.getLocalNodeIdentifier())) {
+if (!clusterCoordinator.isActiveClusterCoordinator()) {
// Occasionally Curator appears to not notify us that we have lost
the elected leader role, or does so
// on a very large delay. So before we kick the node out of the
cluster, we want to first check what the
// ZNode in ZooKeeper says, and ensure that this is the node that
is being advertised as the appropriate
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
index 2ca8ef8..aec3a7a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
@@ -784,8 +784,7 @@ public class NodeClusterCoordinator implements
ClusterCoordinator, ProtocolHandl
@Override
public boolean isActiveClusterCoordinator() {
-final NodeIdentifier self = getLocalNodeIdentifier();
-return self != null && self.equals(getElectedActiveCoordinatorNode());
+return leaderElectionManager != null &&
leaderElectionManager.isLeader(ClusterRoles.CLUSTER_COORDINATOR);
}
@Override
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/heartbeat/TestAbstractHeartbeatMonitor.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/heartbeat/TestAbstractHeartbeatMonitor.java
index 4aeff7b..2245c6e 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/heartbeat/TestAbstractHeartbeatMonitor.java
+++
b/nifi-nar-bundles
[nifi-fds] branch master updated: [NIFI-6646] untheme confirm dialog close button
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new 0f99323 [NIFI-6646] untheme confirm dialog close button
0f99323 is described below
commit 0f99323cf93642455b5075f4f635b3554ac3354f
Author: Scott Aslan
AuthorDate: Mon Sep 9 15:31:01 2019 -0400
[NIFI-6646] untheme confirm dialog close button
---
platform/core/dialogs/confirm-dialog/confirm-dialog.component.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/platform/core/dialogs/confirm-dialog/confirm-dialog.component.html
b/platform/core/dialogs/confirm-dialog/confirm-dialog.component.html
index efc1b87..cc0789c 100644
--- a/platform/core/dialogs/confirm-dialog/confirm-dialog.component.html
+++ b/platform/core/dialogs/confirm-dialog/confirm-dialog.component.html
@@ -20,7 +20,7 @@ limitations under the License.
{{title}}
-close
+close
@@ -42,4 +42,4 @@ limitations under the License.
class="push-left-sm">{{acceptButton}}
-
\ No newline at end of file
+
[nifi-fds] branch master updated: [NIFI-6560] update webapp to useHash routing strategy, request locale files as text
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new 8e82ac7 [NIFI-6560] update webapp to useHash routing strategy,
request locale files as text
8e82ac7 is described below
commit 8e82ac737901b4371f952b87f06e266990578bed
Author: Scott Aslan
AuthorDate: Mon Aug 19 12:37:42 2019 -0400
[NIFI-6560] update webapp to useHash routing strategy, request locale files
as text
This closes #53.
---
webapp/components/flow-design-system/fds-demo.html | 2 +-
webapp/fds-bootstrap.js| 9 +++
webapp/fds.routes.js | 2 +-
webapp/locale/messages.es.xlf | 28 ++
4 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/webapp/components/flow-design-system/fds-demo.html
b/webapp/components/flow-design-system/fds-demo.html
index 3966ed7..d6fd212 100644
--- a/webapp/components/flow-design-system/fds-demo.html
+++ b/webapp/components/flow-design-system/fds-demo.html
@@ -111,7 +111,7 @@ limitations under the License.
Tip: Use UPPERCASE text for 1-2 words, and Titlecase text
for 3+ words.
-Primary
+Primary
Accent
Warn
FDS
Primary
diff --git a/webapp/fds-bootstrap.js b/webapp/fds-bootstrap.js
index eb04914..499ae7e 100644
--- a/webapp/fds-bootstrap.js
+++ b/webapp/fds-bootstrap.js
@@ -32,18 +32,19 @@ import FdsModule from 'webapp/fds.module.js';
enableProdMode();
// Get the locale id from the global
-var locale = navigator.language;
+var locale = navigator.language.toLowerCase();
var providers = [];
// No locale or U.S. English: no translation providers so go ahead and
bootstrap the app
-if (!locale || locale === 'en-US') {
+if (!locale || locale === 'en-us') {
platformBrowserDynamic().bootstrapModule(FdsModule, {providers:
providers});
} else { //load the translation providers and bootstrap the module
-var translationFile = '/locale/messages.' + locale + '.xlf';
+var translationFile = './webapp/locale/messages.' + locale + '.xlf';
$.ajax({
-url: translationFile
+url: translationFile,
+dataType: 'text'
}).done(function (translations) {
// add providers if translation file for locale is loaded
if (translations) {
diff --git a/webapp/fds.routes.js b/webapp/fds.routes.js
index baed473..556edb9 100644
--- a/webapp/fds.routes.js
+++ b/webapp/fds.routes.js
@@ -21,6 +21,6 @@ import FdsDemo from
'webapp/components/flow-design-system/fds-demo.js';
const FdsRoutes = RouterModule.forRoot([{
path: '',
component: FdsDemo
-}]);
+}], { useHash: true });
export default FdsRoutes;
diff --git a/webapp/locale/messages.es.xlf b/webapp/locale/messages.es.xlf
new file mode 100644
index 000..509c452
--- /dev/null
+++ b/webapp/locale/messages.es.xlf
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+ Primary
+ Primario
+A raised button for the primary
use of a card, dialog, or perspective.
+Primary Raised Button
+
+
+
+
[jira] [Created] (MINIFI-515) Make use of new location for commons-daemon
Aldrin Piri created MINIFI-515: -- Summary: Make use of new location for commons-daemon Key: MINIFI-515 URL: https://issues.apache.org/jira/browse/MINIFI-515 Project: Apache NiFi MiNiFi Issue Type: Improvement Reporter: Aldrin Piri Assignee: Aldrin Piri Fix For: 0.6.0 Related to MINIFI-508 and MINIFI-514. Plan to make use of a mirrored repository to have a consistent location and not make builds so fragile when releases occur. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[nifi] branch master updated (2ab9997 -> 7ac6e4c)
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git. from 2ab9997 NIFI-6662: Adding Kudu Lookup Service NIFI-6662: Cleaning up Kudu logic NIFI-6662: Minor enhancements and build fixes NIFI-6662: This closes #3732. add 7ac6e4c NIFI-6711 Clear secret key when auto restarting in order to obtain new secret key from the NiFi process No new revisions were added by this update. Summary of changes: nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java | 1 + 1 file changed, 1 insertion(+)
[jira] [Closed] (MINIFI-502) Update the Windows commons daemon download URL
[ https://issues.apache.org/jira/browse/MINIFI-502?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jeffrey T. Zemerick closed MINIFI-502. --- > Update the Windows commons daemon download URL > -- > > Key: MINIFI-502 > URL: https://issues.apache.org/jira/browse/MINIFI-502 > Project: Apache NiFi MiNiFi > Issue Type: Improvement > Components: Build >Reporter: Jeffrey T. Zemerick >Priority: Major > > Update the URL of the Windows commons daemon zip in minifi-assembly/pom.xml. > It is currently set to > [https://apache.claz.org/commons/daemon/binaries/windows/commons-daemon-1.1.0-bin-windows.zip] > and it is not 100% reliable and often causes the build on Windows to fail. > Change the URL to > [https://www.apache.org/dist/commons/daemon/binaries/windows/commons-daemon-1.1.0-bin-windows.zip.] > -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Assigned] (MINIFI-513) CLONE - Updated bootstrap port handling causes restarts to fail
[
https://issues.apache.org/jira/browse/MINIFI-513?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Bryan Bende reassigned MINIFI-513:
--
Assignee: Bryan Bende (was: Aldrin Piri)
> CLONE - Updated bootstrap port handling causes restarts to fail
> ---
>
> Key: MINIFI-513
> URL: https://issues.apache.org/jira/browse/MINIFI-513
> Project: Apache NiFi MiNiFi
> Issue Type: Bug
>Reporter: Aldrin Piri
>Assignee: Bryan Bende
>Priority: Blocker
> Fix For: 0.6.0
>
> Time Spent: 10m
> Remaining Estimate: 0h
>
> NIFI-6653 introduced a way to avoid the port being changed to prevent a
> possible hijacking of that port to provide other commands than those
> explicitly between bootstrap and the nifi process. This causes issues when
> the NiFi process dies and precludes restart (the default functionality
> enabled out of the box).
> To recreate, build/run NiFi off of current master and kill the NiFi process.
> This will result in the following (when an additional nifi.sh status is
> carried out).
> {quote}2019-09-25 17:10:55,601 WARN [main] org.apache.nifi.bootstrap.RunNiFi
> Apache NiFi appears to have died. Restarting...
> 2019-09-25 17:10:55,620 INFO [main] org.apache.nifi.bootstrap.Command
> Launched Apache NiFi with Process ID 2088
> 2019-09-25 17:10:55,621 INFO [main] org.apache.nifi.bootstrap.RunNiFi
> Successfully started Apache NiFi with PID 2088
> 2019-09-25 17:10:56,174 WARN [NiFi Bootstrap Command Listener]
> org.apache.nifi.bootstrap.RunNiFi Blocking attempt to change NiFi command
> port and secret after they have already been initialized. requestedPort=37871
> 2019-09-25 17:11:50,783 INFO [main] o.a.n.b.NotificationServiceManager
> Successfully loaded the following 0 services: []
> 2019-09-25 17:11:50,785 INFO [main] org.apache.nifi.bootstrap.RunNiFi
> Registered no Notification Services for Notification Type NIFI_STARTED
> 2019-09-25 17:11:50,786 INFO [main] org.apache.nifi.bootstrap.RunNiFi
> Registered no Notification Services for Notification Type NIFI_STOPPED
> 2019-09-25 17:11:50,786 INFO [main] org.apache.nifi.bootstrap.RunNiFi
> Registered no Notification Services for Notification Type NIFI_DIED
> 2019-09-25 17:11:50,809 INFO [main] org.apache.nifi.bootstrap.Command Apache
> NiFi is running at PID 2088 but is not responding to ping requests{quote}
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[nifi-minifi] branch master updated: MINIFI-514 Upgrade commons-daemon to 1.2.1
This is an automated email from the ASF dual-hosted git repository.
thenatog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi.git
The following commit(s) were added to refs/heads/master by this push:
new 6285139 MINIFI-514 Upgrade commons-daemon to 1.2.1
new 4c04810 Merge pull request #170 from apiri/MINIFI-514
6285139 is described below
commit 62851396d7b89331e5c2c38db630a5f605fe4b47
Author: Aldrin Piri
AuthorDate: Thu Sep 26 13:27:57 2019 -0400
MINIFI-514 Upgrade commons-daemon to 1.2.1
---
minifi-assembly/pom.xml | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml
index 557cd7f..778e350 100644
--- a/minifi-assembly/pom.xml
+++ b/minifi-assembly/pom.xml
@@ -77,12 +77,11 @@ limitations under the License.
-
-https://apache.claz.org/commons/daemon/binaries/windows/${commons.daemon.file}";
dest="${java.io.tmpdir}/${commons.daemon.file}" skipexisting="true" />
-
-
-
-
+
+https://apache.claz.org/commons/daemon/binaries/windows/${commons.daemon.file}";
dest="${java.io.tmpdir}/${commons.daemon.file}" skipexisting="true"/>
+
+
+
@@ -336,6 +335,10 @@ limitations under the License.
256
128
+
+
+1.2.1
+
62777d2424361162736b4a9b39b9fb4155760d4d7c4a3489fe1868e0912158ae126ef5f42abbd1bcca1dbf5aa6204d8d0029be7c49f93d6e1421a5173dd7
[nifi] branch master updated: NIFI-6662: Adding Kudu Lookup Service NIFI-6662: Cleaning up Kudu logic NIFI-6662: Minor enhancements and build fixes NIFI-6662: This closes #3732.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 2ab9997 NIFI-6662: Adding Kudu Lookup Service NIFI-6662: Cleaning up
Kudu logic NIFI-6662: Minor enhancements and build fixes NIFI-6662: This closes
#3732.
2ab9997 is described below
commit 2ab99970b778b09e3544867310458acd0913fbbc
Author: samhjelmfelt
AuthorDate: Thu Sep 12 18:55:37 2019 -0500
NIFI-6662: Adding Kudu Lookup Service
NIFI-6662: Cleaning up Kudu logic
NIFI-6662: Minor enhancements and build fixes
NIFI-6662: This closes #3732.
Signed-off-by: Joe Witt
---
.../nifi-kudu-controller-service/pom.xml | 152 +
.../nifi/controller/kudu/KuduLookupService.java| 354 +
.../org.apache.nifi.controller.ControllerService | 16 +
.../controller/kudu/TestKuduLookupService.java | 234 ++
.../nifi-kudu-bundle/nifi-kudu-nar/pom.xml | 5 +
nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 2 +-
6 files changed, 762 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
new file mode 100644
index 000..1f8c6a2
--- /dev/null
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
@@ -0,0 +1,152 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+nifi-kudu-bundle
+org.apache.nifi
+1.10.0-SNAPSHOT
+
+
+nifi-kudu-controller-service
+jar
+
+
+
+None
+1.10.0
+
+
+
+
+
+kr.motd.maven
+os-maven-plugin
+1.6.2
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+${exclude.tests}
+
+
+
+
+
+
+
+org.apache.nifi
+nifi-api
+provided
+
+
+org.apache.nifi
+nifi-lookup-service-api
+provided
+
+
+org.apache.nifi
+nifi-utils
+1.10.0-SNAPSHOT
+provided
+
+
+org.apache.nifi
+nifi-kerberos-credentials-service-api
+provided
+
+
+org.apache.nifi
+nifi-record
+provided
+
+
+org.apache.nifi
+nifi-security-utils
+1.10.0-SNAPSHOT
+provided
+
+
+org.apache.nifi
+nifi-mock
+test
+
+
+org.apache.kudu
+kudu-client
+${kudu.version}
+
+
+org.apache.kudu
+kudu-test-utils
+${kudu.version}
+test
+
+
+
+
+kudu-windows
+
+
+Windows
+
+
+
+
+**/*.java
+
+
+
+kudu-linux
+
+
+Unix
+
+
+
+
+org.apache.kudu
+kudu-binary
+${kudu.version}
+${os.detected.classifier}
+test
+
+
+
+
+kudu-mac
+
+
+mac
+
+
+
+
+org.apache.kudu
+kudu-binary
+${kudu.version}
+${os.detected.classifier}
+test
+
+
+
+
+
\ No newline at end of file
diff --git
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/src/main/java/org/apache/nifi/controller/kudu/KuduLookupService.java
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/src/main/java/org/apache/nifi/controller/kudu/KuduLookupService.java
new file mode 100644
index 000..b044f9a
--- /dev/null
+++
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/src/main/java/org/apache/nifi/controller/kudu/KuduLookupService.java
@@ -0,0 +1,354 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for a
[nifi-fds] branch master updated: [NIFI-6495] update drop down menu overlay panel min height
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new 3903d6f [NIFI-6495] update drop down menu overlay panel min height
3903d6f is described below
commit 3903d6f02c8f580d5c066e92fda9430141c0297f
Author: Scott Aslan
AuthorDate: Tue Aug 13 12:25:53 2019 -0400
[NIFI-6495] update drop down menu overlay panel min height
This closes #52.
---
platform/core/common/styles/_menus.scss | 1 +
1 file changed, 1 insertion(+)
diff --git a/platform/core/common/styles/_menus.scss
b/platform/core/common/styles/_menus.scss
index 43d8637..4dc705a 100644
--- a/platform/core/common/styles/_menus.scss
+++ b/platform/core/common/styles/_menus.scss
@@ -26,6 +26,7 @@
body[fds] .mat-menu-panel {
border-radius: 2px;
max-width: unset;
+min-height: 40px;
}
body[fds] .mat-menu-item {
[nifi-fds] branch master updated: [NIFI-6547] update hover state, font colors, border, and line height of tab button toggle
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new ae4dd93 [NIFI-6547] update hover state, font colors, border, and line
height of tab button toggle
ae4dd93 is described below
commit ae4dd93b9bd4f71c69324bde12a7476ce14c2904
Author: Scott Aslan
AuthorDate: Tue Aug 13 14:09:23 2019 -0400
[NIFI-6547] update hover state, font colors, border, and line height of tab
button toggle
This closes #51.
---
platform/core/common/styles/_buttonToggles.scss| 14 ++
webapp/components/flow-design-system/fds-demo.html | 4 +---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/platform/core/common/styles/_buttonToggles.scss
b/platform/core/common/styles/_buttonToggles.scss
index b82157b..8788acf 100644
--- a/platform/core/common/styles/_buttonToggles.scss
+++ b/platform/core/common/styles/_buttonToggles.scss
@@ -112,4 +112,18 @@
color: $grey1;
border: 1px solid $grey4;
}
+
+body[fds] .tab-toggle-group >
.mat-button-toggle-checked.mat-button-toggle-appearance-standard {
+color: rgba(0, 0, 0, 0.54);
+}
+
+body[fds] .tab-toggle-group > .mat-button-toggle-appearance-standard {
+color: rgba(0, 0, 0, 0.38);
+background: transparent;
+border-left: 0;
+}
+
+body[fds] .tab-toggle-group > .mat-button-toggle-appearance-standard
.mat-button-toggle-label-content {
+line-height: 38px;
+}
}
diff --git a/webapp/components/flow-design-system/fds-demo.html
b/webapp/components/flow-design-system/fds-demo.html
index 37e82df..3966ed7 100644
--- a/webapp/components/flow-design-system/fds-demo.html
+++ b/webapp/components/flow-design-system/fds-demo.html
@@ -270,14 +270,12 @@ limitations under the License.
-
+
general
-
Users
-
Workflow
[nifi-fds] branch master updated: [NIFI-6549] update field label font weight and color
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new 42eeb0c [NIFI-6549] update field label font weight and color
42eeb0c is described below
commit 42eeb0cc9de49f5bca18e239bf7e0f3dd7dcedbe
Author: Scott Aslan
AuthorDate: Mon Aug 12 13:27:44 2019 -0400
[NIFI-6549] update field label font weight and color
This closes #50.
---
platform/core/common/styles/_inputs.scss | 5 +
1 file changed, 5 insertions(+)
diff --git a/platform/core/common/styles/_inputs.scss
b/platform/core/common/styles/_inputs.scss
index bfa1bc9..93b0927 100644
--- a/platform/core/common/styles/_inputs.scss
+++ b/platform/core/common/styles/_inputs.scss
@@ -69,6 +69,11 @@
font-weight: 300;
}
+body[fds] .mat-form-field .mat-form-field-label {
+color: $grey3;
+font-weight: 300;
+}
+
body[fds] .mat-form-field-can-float.mat-form-field-should-float
.mat-form-field-placeholder {
transform: translateY(-26px) translateX(-10px) scale(0.75);
}
[nifi] branch master updated: NIFI-6587 - Fix: Unable save sensitive property value that equals masked value
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 2493665 NIFI-6587 - Fix: Unable save sensitive property value that
equals masked value
2493665 is described below
commit 2493665c2758f1568225d9f6b8e6bd5acd411aed
Author: Rob Fellows
AuthorDate: Mon Sep 30 11:17:16 2019 -0400
NIFI-6587 - Fix: Unable save sensitive property value that equals masked
value
This closes #3778
Signed-off-by: Scott Aslan
---
.../src/main/webapp/js/nf/canvas/nf-parameter-contexts.js | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
index 66e9d35..c86df4d 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
@@ -958,6 +958,11 @@
} else {
// value is not sensitive or it is sensitive and the user has
changed it then always take the current value
serializedValue = value;
+
+// if the param is sensitive and the param value has not
"changed", that means it matches the mask and it should still be considered
changed
+if (!hasChanged && !_.isEmpty(parameter) &&
parameter.sensitive === true && parameter.isNew === false) {
+hasChanged = true;
+}
}
} else {
if (isChecked) {
@@ -1610,15 +1615,7 @@
e.stopImmediatePropagation();
} else if (target.hasClass('edit-parameter')) {
var closeHandler = function () {
-$('#parameter-name').val('');
-$('#parameter-value-field').val('');
-$('#parameter-description-field').val('');
-$('#parameter-sensitive-radio-button').prop('checked',
false);
-
$('#parameter-not-sensitive-radio-button').prop('checked', false);
-$('#parameter-name').prop('disabled', false);
-
$('#parameter-sensitive-radio-button').prop('disabled', false);
-
$('#parameter-not-sensitive-radio-button').prop('disabled', false);
-
$('#parameter-set-empty-string-field').removeClass('checkbox-checked').addClass('checkbox-unchecked');
+resetParameterDialog();
};
var openHandler = function () {
[nifi] branch master updated: NIFI-6694 This closes #3779. Exclude Hive 3 components from caching and build stages Added exclusion of nifi-hive3-nar and nifi-hive3-processors from the caching stages A
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/master by this push: new 8132d18 NIFI-6694 This closes #3779. Exclude Hive 3 components from caching and build stages Added exclusion of nifi-hive3-nar and nifi-hive3-processors from the caching stages Added "*hive3*" to the find command used to filter (remove) directories from the build stages 8132d18 is described below commit 8132d182c7f5e7865fbce39f08bbaabf120c9905 Author: Jeff Storck AuthorDate: Mon Sep 30 10:51:58 2019 -0400 NIFI-6694 This closes #3779. Exclude Hive 3 components from caching and build stages Added exclusion of nifi-hive3-nar and nifi-hive3-processors from the caching stages Added "*hive3*" to the find command used to filter (remove) directories from the build stages Signed-off-by: Joe Witt --- .travis.yml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 912213a..72ae924 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: script: >- if [ ! -d "$HOME"/.m2/repository ] || [ ! "$(ls -A "$HOME"/.m2/repository)" ] ; then echo "Cached Maven repository does not exist, downloading dependencies..." - mvn -V -T 1C dependency:go-offline -Dsilent -ntp --fail-never \ + mvn -V -T 1C -pl !./nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar,!./nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors dependency:go-offline -Dsilent -ntp --fail-never \ | grep -v -F -f .travis-output-filters -e "Failed to execute goal on project" else echo "Cached Maven repository exists, skipping dependency cache" @@ -33,7 +33,7 @@ matrix: script: >- if [ ! -d "$HOME"/.m2/repository ] || [ ! "$(ls -A "$HOME"/.m2/repository)" ] ; then echo "Cached Maven repository does not exist, downloading dependencies..." - mvn -V -T 1C dependency:go-offline -Dsilent -ntp --fail-never \ + mvn -V -T 1C -pl !./nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar,!./nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors dependency:go-offline -Dsilent -ntp --fail-never \ | grep -v -F -f .travis-output-filters -e "Failed to execute goal on project" else echo "Cached Maven repository exists, skipping dependency cache" @@ -47,7 +47,7 @@ matrix: jdk: openjdk8 script: >- mvn clean install -V -T 1C --pl `find . -type d \( -name "*-nar" -or -name "*-assembly" \) -and -not -name "*api-nar" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` +-pl `find . -type d \( -name "*-nar" -or -name "*-assembly" -or -name "*hive3*" \) -and -not -name "*api-nar" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` -Pcontrib-check,include-grpc -Ddir-only -Dmaven.surefire.arguments="-Duser.language=en -Duser.region=US" | grep -v -F -f .travis-output-filters @@ -57,7 +57,7 @@ matrix: jdk: openjdk8 script: >- mvn clean install -V -T 1C --pl `find . -type d \( -name "*-nar" -or -name "*-assembly" \) -and -not -name "*api-nar" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` +-pl `find . -type d \( -name "*-nar" -or -name "*-assembly" -or -name "*hive3*" \) -and -not -name "*api-nar" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` -Pcontrib-check,include-grpc -Ddir-only -Dmaven.surefire.arguments="-Duser.language=fr -Duser.region=FR" | grep -v -F -f .travis-output-filters @@ -67,7 +67,7 @@ matrix: jdk: openjdk8 script: >- mvn clean install -V -T 1C --pl `find . -type d \( -name "*-nar" -or -name "*-assembly" \) -and -not -name "*api-nar" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` +-pl `find . -type d \( -name "*-nar" -or -name "*-assembly" -or -name "*hive3*" \) -and -not -name "*api-nar" -and -not -name "*hive3*" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` -Pcontrib-check,include-grpc -Ddir-only -Dmaven.surefire.arguments="-Duser.language=ja -Duser.region=JP" | grep -v -F -f .travis-output-filters @@ -87,7 +87,7 @@ matrix: script: - >- mvn clean install -V -T 1C - -pl `find . -type d \( -name "*-nar" -or -name "*-assembly" \) -and -not -name "*api-nar" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` + -pl `find . -type d \( -name "*-nar" -or -name "*-assembly" -or -name "*hive3*" \) -and -not -name "*api-nar" -and -not -path "*/target/*" -and -not -name "*__*" -printf "!./%P,"` -Pcontrib-check,include-grpc -Ddir-only -Dmaven.surefire.arguments="-Duser.l
[nifi-minifi-cpp] branch master updated: MINIFICPP-1041: Update JSON header for the connection queues
This is an automated email from the ASF dual-hosted git repository.
aldrin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new ac45201 MINIFICPP-1041: Update JSON header for the connection queues
ac45201 is described below
commit ac45201b68fd1c16ee2395b5faa5f39c44242a92
Author: Marc Parisi
AuthorDate: Mon Sep 23 12:59:35 2019 -0400
MINIFICPP-1041: Update JSON header for the connection queues
This closes #652.
Signed-off-by: Aldrin Piri
---
libminifi/include/c2/protocols/RESTProtocol.h | 11 ---
libminifi/src/c2/protocols/RESTProtocol.cpp | 43 +++
2 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/libminifi/include/c2/protocols/RESTProtocol.h
b/libminifi/include/c2/protocols/RESTProtocol.h
index 6d848ec..d54e8f0 100644
--- a/libminifi/include/c2/protocols/RESTProtocol.h
+++ b/libminifi/include/c2/protocols/RESTProtocol.h
@@ -18,11 +18,8 @@
#ifndef LIBMINIFI_INCLUDE_C2_PROTOCOLS_RESTPROTOCOL_H_
#define LIBMINIFI_INCLUDE_C2_PROTOCOLS_RESTPROTOCOL_H_
-
-
#include
-
#ifdef RAPIDJSON_ASSERT
#undef RAPIDJSON_ASSERT
#endif
@@ -58,7 +55,7 @@ namespace c2 {
*
*/
-struct ValueObject{
+struct ValueObject {
std::string name;
std::vector values;
};
@@ -80,6 +77,12 @@ class RESTProtocol {
virtual rapidjson::Value serializeJsonPayload(const C2Payload &payload,
rapidjson::Document::AllocatorType &alloc);
+ /**
+ * connection queues should have the uuid as the object name; however since
we have an internal AST and don't want to
+ * impact backwards copmatibility ( where the object root is the name ),
then we should serialize the queues differently.
+ */
+ virtual rapidjson::Value serializeConnectionQueues(const C2Payload &payload,
std::string &label, rapidjson::Document::AllocatorType &alloc);
+
virtual std::string serializeJsonRootPayload(const C2Payload& payload);
virtual void mergePayloadContent(rapidjson::Value &target, const C2Payload
&payload, rapidjson::Document::AllocatorType &alloc);
diff --git a/libminifi/src/c2/protocols/RESTProtocol.cpp
b/libminifi/src/c2/protocols/RESTProtocol.cpp
index fad4d67..37a53e6 100644
--- a/libminifi/src/c2/protocols/RESTProtocol.cpp
+++ b/libminifi/src/c2/protocols/RESTProtocol.cpp
@@ -311,19 +311,52 @@ bool RESTProtocol::containsPayload(const C2Payload &o) {
return false;
}
+rapidjson::Value RESTProtocol::serializeConnectionQueues(const C2Payload
&payload, std::string &label, rapidjson::Document::AllocatorType &alloc) {
+ rapidjson::Value json_payload(payload.isContainer() ? rapidjson::kArrayType
: rapidjson::kObjectType);
+
+ C2Payload adjusted(payload.getOperation(), payload.getIdentifier(), false,
payload.isRaw());
+
+ auto name = payload.getLabel();
+ std::string uuid;
+ C2ContentResponse updatedContent(payload.getOperation());
+ for (const C2ContentResponse &content : payload.getContent()) {
+for (const auto& op_arg : content.operation_arguments) {
+ if (op_arg.first == "uuid") {
+uuid = op_arg.second.to_string();
+ }
+ updatedContent.operation_arguments.insert(op_arg);
+}
+ }
+ updatedContent.name = uuid;
+ adjusted.setLabel(uuid);
+ adjusted.setIdentifier(uuid);
+ state::response::ValueNode nd;
+ // name should be what was previously the TLN ( top level node )
+ nd = name;
+ updatedContent.operation_arguments.insert(std::make_pair("name", nd));
+ // the rvalue reference is an unfortunate side effect of the underlying API
decision.
+ adjusted.addContent(std::move(updatedContent), true);
+ mergePayloadContent(json_payload, adjusted, alloc);
+ label = uuid;
+ return json_payload;
+}
+
rapidjson::Value RESTProtocol::serializeJsonPayload(const C2Payload &payload,
rapidjson::Document::AllocatorType &alloc) {
-// get the name from the content
+ // get the name from the content
rapidjson::Value json_payload(payload.isContainer() ? rapidjson::kArrayType
: rapidjson::kObjectType);
std::vector children;
+ bool isQueue = payload.getLabel() == "queues";
+
for (const auto &nested_payload : payload.getNestedPayloads()) {
-rapidjson::Value* child_payload = new
rapidjson::Value(serializeJsonPayload(nested_payload, alloc));
+std::string label = nested_payload.getLabel();
+rapidjson::Value* child_payload = new rapidjson::Value(isQueue ?
serializeConnectionQueues(nested_payload, label, alloc) :
serializeJsonPayload(nested_payload, alloc));
if (nested_payload.isCollapsible()) {
bool combine = false;
for (auto &subordinate : children) {
-if (subordinate.name == nested_payload.getLabel()) {
+if (subordinate.name == label) {
subordinate.values.push_back(child_payload);
combine = true;
break;
@@ -331,13 +364,13 @@ rapidjson::Value RESTProtocol::serializeJsonPayload(const
C2Payload &payl
[nifi-site] branch master updated: Update people.hbs, add rfellows as committer
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-site.git The following commit(s) were added to refs/heads/master by this push: new 48fc25a Update people.hbs, add rfellows as committer 48fc25a is described below commit 48fc25a0d60b10147b93e231e93f979a02d1026a Author: Rob Fellows AuthorDate: Mon Sep 30 12:02:49 2019 -0400 Update people.hbs, add rfellows as committer --- src/pages/html/people.hbs | 5 + 1 file changed, 5 insertions(+) diff --git a/src/pages/html/people.hbs b/src/pages/html/people.hbs index d6e1991..688e6b4 100644 --- a/src/pages/html/people.hbs +++ b/src/pages/html/people.hbs @@ -264,6 +264,11 @@ title: Apache NiFi Team Nathan Gough + +rfellows +Rob Fellows + +
[nifi] branch master updated: NIFI-6726: Updated fingerprint logic to ensure that Controller Services are fingerprinted when housed within a ProcessGroup
This is an automated email from the ASF dual-hosted git repository.
bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 6dccdd5 NIFI-6726: Updated fingerprint logic to ensure that
Controller Services are fingerprinted when housed within a ProcessGroup
6dccdd5 is described below
commit 6dccdd586e6ef8d1bda625982814f2a073918924
Author: Mark Payne
AuthorDate: Mon Sep 30 10:21:31 2019 -0400
NIFI-6726: Updated fingerprint logic to ensure that Controller Services are
fingerprinted when housed within a ProcessGroup
This closes #3775.
Signed-off-by: Bryan Bende
---
.../nifi/fingerprint/FingerprintFactory.java | 15 ++---
.../nifi/fingerprint/FingerprintFactoryTest.java | 28
.../fingerprint/group-with-controller-services.xml | 37 ++
3 files changed, 76 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
index 3cf3df2..35d081b 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
@@ -238,7 +238,7 @@ public class FingerprintFactory {
// root group
final Element rootGroupElem = (Element)
DomUtils.getChildNodesByTagName(flowControllerElem, "rootGroup").item(0);
-addProcessGroupFingerprint(builder, rootGroupElem, controller);
+addProcessGroupFingerprint(builder, rootGroupElem, encodingVersion);
final Element controllerServicesElem =
DomUtils.getChild(flowControllerElem, "controllerServices");
if (controllerServicesElem != null) {
@@ -354,7 +354,7 @@ public class FingerprintFactory {
return builder;
}
-private StringBuilder addProcessGroupFingerprint(final StringBuilder
builder, final Element processGroupElem, final FlowController controller)
throws FingerprintException {
+StringBuilder addProcessGroupFingerprint(final StringBuilder builder,
final Element processGroupElem, final FlowEncodingVersion encodingVersion)
throws FingerprintException {
// id
appendFirstValue(builder,
DomUtils.getChildNodesByTagName(processGroupElem, "id"));
appendFirstValue(builder,
DomUtils.getChildNodesByTagName(processGroupElem, "versionedComponentId"));
@@ -372,7 +372,7 @@ public class FingerprintFactory {
// processors
final List processorElems =
DomUtils.getChildElementsByTagName(processGroupElem, "processor");
-Collections.sort(processorElems, getIdsComparator());
+processorElems.sort(getIdsComparator());
for (final Element processorElem : processorElems) {
addFlowFileProcessorFingerprint(builder, processorElem);
}
@@ -402,7 +402,7 @@ public class FingerprintFactory {
final NodeList nestedProcessGroupElems =
DomUtils.getChildNodesByTagName(processGroupElem, "processGroup");
final List sortedNestedProcessGroupElems =
sortElements(nestedProcessGroupElems, getIdsComparator());
for (final Element nestedProcessGroupElem :
sortedNestedProcessGroupElems) {
-addProcessGroupFingerprint(builder, nestedProcessGroupElem,
controller);
+addProcessGroupFingerprint(builder, nestedProcessGroupElem,
encodingVersion);
}
// remote process groups
@@ -426,6 +426,13 @@ public class FingerprintFactory {
addFunnelFingerprint(builder, funnelElem);
}
+final NodeList controllerServiceElems =
DomUtils.getChildNodesByTagName(processGroupElem, "controllerService");
+final List sortedControllerServiceElems =
sortElements(controllerServiceElems, getIdsComparator());
+for (final Element controllerServiceElem :
sortedControllerServiceElems) {
+final ControllerServiceDTO dto =
FlowFromDOMFactory.getControllerService(controllerServiceElem, encryptor,
encodingVersion);
+addControllerServiceFingerprint(builder, dto);
+}
+
// add variables
final NodeList variableElems =
DomUtils.getChildNodesByTagName(processGroupElem, "variable");
final List sortedVarList = sortElements(variableElems,
getVariableNameComparator());
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/Finge
[nifi] branch master updated: NIFI-6132: This closes #3776. Do not default ot G1GC because it has known issues with Java 8 and earlier versions
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/master by this push: new 5562c58 NIFI-6132: This closes #3776. Do not default ot G1GC because it has known issues with Java 8 and earlier versions 5562c58 is described below commit 5562c587fe4115097a143186c5d7a0efe7086b9c Author: Mark Payne AuthorDate: Mon Sep 30 10:53:25 2019 -0400 NIFI-6132: This closes #3776. Do not default ot G1GC because it has known issues with Java 8 and earlier versions Signed-off-by: Joe Witt --- .../nifi-resources/src/main/resources/conf/bootstrap.conf | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf index f1da811..5fa1cf2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf @@ -44,9 +44,10 @@ java.arg.4=-Djava.net.preferIPv4Stack=true java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol -# The G1GC is still considered experimental but has proven to be very advantageous in providing great -# performance without significant "stop-the-world" delays. -java.arg.13=-XX:+UseG1GC +# The G1GC is known to cause some problems in Java 8 and earlier, but the issues were addressed in Java 9. If using Java 8 or earlier, +# it is recommended that G1GC not be used, especially in conjunction with the Write Ahead Provenance Repository. However, if using a newer +# version of Java, it can result in better performance without significant "stop-the-world" delays. +#java.arg.13=-XX:+UseG1GC #Set headless mode by default java.arg.14=-Djava.awt.headless=true
[nifi] 01/02: NIFI-6542: Upgrade nifi-hadoop-bundles Hadoop version dependency to 3.2.0
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git commit d5a7fc5daa27104e7b0bd208dc0e35ce18ef769f Author: David Mollitor AuthorDate: Mon Sep 9 15:23:22 2019 -0400 NIFI-6542: Upgrade nifi-hadoop-bundles Hadoop version dependency to 3.2.0 --- nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml | 7 ++- .../nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml index e75cc02..abaa169 100644 --- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml @@ -22,7 +22,7 @@ nifi-hdfs-processors jar -3.0.0 +3.2.0 @@ -82,6 +82,11 @@ 2.6 +commons-lang +commons-lang +2.6 + + org.apache.nifi nifi-properties diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml index 6d80dd5..9396b21 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml @@ -22,7 +22,7 @@ true 1.8.1 2.11.0 -3.0.0 +3.2.0
[nifi] branch master updated (7cb8732 -> 48759be)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git. from 7cb8732 NIFI-6709 - Upgrade jackson-databind direct dependencies to 2.9.10 new d5a7fc5 NIFI-6542: Upgrade nifi-hadoop-bundles Hadoop version dependency to 3.2.0 new 48759be Updated license information dnsjava The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: nifi-assembly/LICENSE | 27 .../nifi-hdfs-processors/pom.xml | 7 +- .../nifi-hadoop-libraries-nar/pom.xml | 2 +- .../src/main/resources/META-INF/LICENSE| 29 +- 4 files changed, 62 insertions(+), 3 deletions(-)
[nifi] 02/02: Updated license information dnsjava
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git commit 48759be9746443aad8107aa77e710e6014b178c5 Author: David Mollitor AuthorDate: Fri Sep 20 09:13:13 2019 -0400 Updated license information dnsjava --- nifi-assembly/LICENSE | 27 .../src/main/resources/META-INF/LICENSE| 29 +- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE index b1e3de8..66c7c13 100644 --- a/nifi-assembly/LICENSE +++ b/nifi-assembly/LICENSE @@ -2554,6 +2554,33 @@ This product bundles 'lodash' which is available under an MIT license. licenses; we recommend you read them, as their terms may differ from the terms above. +This product bundles 'dnsjava' which is available under a BSD 2-Clause "Simplified" License. + +Copyright (c) 1998-2011, Brian Wellington. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + This product bundles 'moment' which is available under an MIT license. Copyright (c) JS Foundation and other contributors diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE index 32d3b8a..e25f11d 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE @@ -384,4 +384,31 @@ The binary distribution of this product bundles 'leveldbjni-all-1.8.jar' which i DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +This product bundles 'dnsjava' which is available under a BSD 2-Clause "Simplified" License. + +Copyright (c) 1998-2011, Brian Wellington. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE.
[nifi-minifi-cpp] branch master updated: MINIFICPP-1050 - Make PublishKafka's Delivery Guarantee backwards compatible
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 8baf3be MINIFICPP-1050 - Make PublishKafka's Delivery Guarantee
backwards compatible
8baf3be is described below
commit 8baf3bed60f9a08688db43c82ba01a2fea6b6718
Author: Daniel Bakai
AuthorDate: Sat Sep 28 21:28:54 2019 +0200
MINIFICPP-1050 - Make PublishKafka's Delivery Guarantee backwards compatible
Signed-off-by: Arpad Boda
This closes #654
---
NOTICE | 1 +
extensions/librdkafka/PublishKafka.cpp | 20 +++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index 7dcbc81..e8dcee8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -34,3 +34,4 @@ This includes derived works from the CMake (BSD 3-Clause
licensed) project (http
Copyright 2000-2019 Kitware, Inc. and Contributors
The derived work is adapted from
Modules/FindPatch.cmake
+and can be found in cmake/FindPatch.cmake
diff --git a/extensions/librdkafka/PublishKafka.cpp
b/extensions/librdkafka/PublishKafka.cpp
index 75f8839..de72d23 100644
--- a/extensions/librdkafka/PublishKafka.cpp
+++ b/extensions/librdkafka/PublishKafka.cpp
@@ -45,7 +45,10 @@ core::Property PublishKafka::Topic(
->isRequired(true)->supportsExpressionLanguage(true)->build());
core::Property PublishKafka::DeliveryGuarantee(
-core::PropertyBuilder::createProperty("Delivery
Guarantee")->withDescription("Specifies the requirement for guaranteeing that a
message is sent to Kafka")
+core::PropertyBuilder::createProperty("Delivery
Guarantee")->withDescription("Specifies the requirement for guaranteeing that a
message is sent to Kafka. "
+
"Valid values are 0 (do not wait for acks), "
+
"-1 or all (block until message is committed by all in sync replicas) "
+
"or any concrete number of nodes.")
->isRequired(false)->supportsExpressionLanguage(true)->withDefaultValue(DELIVERY_ONE_NODE)->build());
core::Property PublishKafka::MaxMessageSize(
@@ -411,6 +414,21 @@ bool PublishKafka::createNewTopic(const
std::shared_ptr &conn,
value = "";
if (context->getProperty(DeliveryGuarantee.getName(), value) &&
!value.empty()) {
+/*
+ * Because of a previous error in this processor, the default value of
this property was "DELIVERY_ONE_NODE".
+ * As this is not a valid value for "request.required.acks", the following
rd_kafka_topic_conf_set call failed,
+ * but because of an another error, this failure was silently ignored,
meaning that the the default value for
+ * "request.required.acks" did not change, and thus remained "-1". This
means that having "DELIVERY_ONE_NODE" as
+ * the value of this property actually caused the processor to wait for
delivery ACKs from ALL nodes, instead
+ * of just one. In order not to break configurations generated with
earlier versions and keep the same behaviour
+ * as they had, we have to map "DELIVERY_ONE_NODE" to "-1" here.
+ */
+if (value == "DELIVERY_ONE_NODE") {
+ value = "-1";
+ logger_->log_warn("Using DELIVERY_ONE_NODE as the Delivery Guarantee
property is deprecated and is translated to -1 "
+"(block until message is committed by all in sync
replicas) for backwards compatibility. "
+"If you want to wait for one acknowledgment use '1' as
the property.");
+}
result = rd_kafka_topic_conf_set(topic_conf_, "request.required.acks",
value.c_str(), errstr.data(), errstr.size());
logger_->log_debug("PublishKafka: request.required.acks [%s]", value);
if (result != RD_KAFKA_CONF_OK) {
