This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 3aecd3bda9 NIFI-11265 Removed nifi-toolkit-flowanalyzer
3aecd3bda9 is described below
commit 3aecd3bda91c29f639892504fe5f54df9478c367
Author: exceptionfactory <[email protected]>
AuthorDate: Fri Mar 10 08:55:59 2023 -0600
NIFI-11265 Removed nifi-toolkit-flowanalyzer
Signed-off-by: Pierre Villard <[email protected]>
This closes #7028.
---
nifi-toolkit/nifi-toolkit-assembly/pom.xml | 5 -
.../src/main/resources/bin/flow-analyzer.bat | 41 ------
.../src/main/resources/bin/flow-analyzer.sh | 119 ---------------
nifi-toolkit/nifi-toolkit-flowanalyzer/pom.xml | 54 -------
.../toolkit/flowanalyzer/FlowAnalyzerDriver.java | 161 ---------------------
.../nifi/toolkit/FlowAnalyzerDriverTest.java | 61 --------
nifi-toolkit/pom.xml | 1 -
7 files changed, 442 deletions(-)
diff --git a/nifi-toolkit/nifi-toolkit-assembly/pom.xml
b/nifi-toolkit/nifi-toolkit-assembly/pom.xml
index 8b858102dc..9aea7ac9e2 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-assembly/pom.xml
@@ -87,11 +87,6 @@ language governing permissions and limitations under the
License. -->
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-toolkit-zookeeper-migrator</artifactId>
<version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-toolkit-flowanalyzer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git
a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
deleted file mode 100644
index 0a4d83454d..0000000000
---
a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
+++ /dev/null
@@ -1,41 +0,0 @@
-@echo off
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-
-rem Use JAVA_HOME if it's set; otherwise, just use java
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-set JAVA_EXE=%JAVA_HOME%\bin\java.exe
-goto startConfig
-
-:noJavaHome
-echo The JAVA_HOME environment variable is not defined correctly.
-echo Instead the PATH will be used to find the java executable.
-echo.
-set JAVA_EXE=java
-goto startConfig
-
-:startConfig
-set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
-
-if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xms12m -Xmx24m
-
-SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS%
org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver
-
-cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
-
diff --git
a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
deleted file mode 100755
index 6785ae6634..0000000000
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-#
-# 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 regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-# Script structure inspired from Apache Karaf and other Apache projects with
similar startup approaches
-
-SCRIPT_DIR=$(dirname "$0")
-SCRIPT_NAME=$(basename "$0")
-NIFI_TOOLKIT_HOME=$(cd "${SCRIPT_DIR}" && cd .. && pwd)
-PROGNAME=$(basename "$0")
-
-
-warn() {
- (>&2 echo "${PROGNAME}: $*")
-}
-
-die() {
- warn "$*"
- exit 1
-}
-
-detectOS() {
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
- aix=false;
- os400=false;
- darwin=false;
- case "$(uname)" in
- CYGWIN*)
- cygwin=true
- ;;
- AIX*)
- aix=true
- ;;
- OS400*)
- os400=true
- ;;
- Darwin)
- darwin=true
- ;;
- esac
- # For AIX, set an environment variable
- if ${aix}; then
- export LDR_CNTRL=MAXDATA=0xB0000000@DSA
- echo ${LDR_CNTRL}
- fi
-}
-
-locateJava() {
- # Setup the Java Virtual Machine
- if $cygwin ; then
- [ -n "${JAVA}" ] && JAVA=$(cygpath --unix "${JAVA}")
- [ -n "${JAVA_HOME}" ] && JAVA_HOME=$(cygpath --unix "${JAVA_HOME}")
- fi
-
- if [ "x${JAVA}" = "x" ] && [ -r /etc/gentoo-release ] ; then
- JAVA_HOME=$(java-config --jre-home)
- fi
- if [ "x${JAVA}" = "x" ]; then
- if [ "x${JAVA_HOME}" != "x" ]; then
- if [ ! -d "${JAVA_HOME}" ]; then
- die "JAVA_HOME is not valid: ${JAVA_HOME}"
- fi
- JAVA="${JAVA_HOME}/bin/java"
- else
- warn "JAVA_HOME not set; results may vary"
- JAVA=$(type java)
- JAVA=$(expr "${JAVA}" : '.* \(/.*\)$')
- if [ "x${JAVA}" = "x" ]; then
- die "java command not found"
- fi
- fi
- fi
-}
-
-init() {
- # Determine if there is special OS handling we must perform
- detectOS
-
- # Locate the Java VM to execute
- locateJava "$1"
-}
-
-run() {
- LIBS="${NIFI_TOOLKIT_HOME}/lib/*"
-
- sudo_cmd_prefix=""
- if $cygwin; then
- NIFI_TOOLKIT_HOME=$(cygpath --path --windows "${NIFI_TOOLKIT_HOME}")
- CLASSPATH="$NIFI_TOOLKIT_HOME/classpath;$(cygpath --path --windows
"${LIBS}")"
- else
- CLASSPATH="$NIFI_TOOLKIT_HOME/classpath:${LIBS}"
- fi
-
- export JAVA_HOME="$JAVA_HOME"
- export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
-
- umask 0077
- exec "${JAVA}" -cp "${CLASSPATH}" ${JAVA_OPTS:--Xms12m -Xmx24m}
org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver "$@"
-}
-
-
-init "$1"
-run "$@"
diff --git a/nifi-toolkit/nifi-toolkit-flowanalyzer/pom.xml
b/nifi-toolkit/nifi-toolkit-flowanalyzer/pom.xml
deleted file mode 100644
index 0bc0d978f9..0000000000
--- a/nifi-toolkit/nifi-toolkit-flowanalyzer/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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 regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-toolkit</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>nifi-toolkit-flowanalyzer</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-security-utils</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-xml-processing</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>src/test/resources/test-data.json</exclude>
-
<exclude>src/test/resources/test-data-user-pass.json</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git
a/nifi-toolkit/nifi-toolkit-flowanalyzer/src/main/java/org/apache/nifi/toolkit/flowanalyzer/FlowAnalyzerDriver.java
b/nifi-toolkit/nifi-toolkit-flowanalyzer/src/main/java/org/apache/nifi/toolkit/flowanalyzer/FlowAnalyzerDriver.java
deleted file mode 100644
index 6b5e23802f..0000000000
---
a/nifi-toolkit/nifi-toolkit-flowanalyzer/src/main/java/org/apache/nifi/toolkit/flowanalyzer/FlowAnalyzerDriver.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * 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 regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.toolkit.flowanalyzer;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.zip.GZIPInputStream;
-import org.apache.nifi.xml.processing.parsers.DocumentProvider;
-import org.apache.nifi.xml.processing.parsers.StandardDocumentProvider;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class FlowAnalyzerDriver {
- final static String CONST_BYTES_GB_CONV = "1000000000";
- final static String CONST_BYTES_MB_CONV = "1000000";
- final static String CONST_BYTES_KB_CONV = "1000";
- final static int DIVIDE_SCALE = 9;
- final static String CONST_XMLNODE_CONNECTION = "connection";
-
- private static void printUsage() {
- System.out.println("This application seeks to produce a report to
analyze the flow.xml.gz file");
- System.out.println(
- "Currently the reports supported by this application are Total
Storage for all queues " +
- "backpressure, average storage of all queues backpressure, and
min and max of all queues " +
- "backpressure over the entire flow.");
- System.out.println("\n\n\n");
- System.out.println("Usage: flow-analyzer.sh <path to flow.xml.gz>");
- }
-
- public static void main(String[] args) throws Exception {
- BigDecimal totalDataSize = new BigDecimal("0.0");
- BigDecimal max = new BigDecimal("0.0");
- BigDecimal min = new BigDecimal("0.0");
- BigDecimal avg = new BigDecimal("0.0");
- long maxQueueSize = 0L;
- long minQueueSize = 0L;
- long totalQueueSize = 0L;
-
- int numberOfConnections = 0;
-
- if (helpRequested(args)) {
- printUsage();
- return;
- }
-
- String input = args[0];
- if (!input.contains("xml.gz"))
- input = input + "/flow.xml.gz";
-
- InputStream fileStream = new FileInputStream(input);
- InputStream gzipStream = new GZIPInputStream(fileStream);
-
- System.out.println("Using flow=" + input);
-
- try {
- final DocumentProvider documentProvider = new
StandardDocumentProvider();
- Document document = documentProvider.parse(gzipStream);
- NodeList connectionNode =
document.getElementsByTagName(CONST_XMLNODE_CONNECTION);
-
- for (int x = 0; x < connectionNode.getLength(); x++) {
- Node nNode = connectionNode.item(x);
- if (nNode.getNodeType() == Node.ELEMENT_NODE) {
- Element maxWorkQueueSize = (Element) nNode;
- String maxDataSize =
maxWorkQueueSize.getElementsByTagName("maxWorkQueueDataSize").item(0)
- .getTextContent();
- BigDecimal byteValue =
(convertSizeToByteValue(maxDataSize)) != null
- ? convertSizeToByteValue(maxDataSize) : new
BigDecimal("0.0");
- numberOfConnections++;
- avg = avg.add(byteValue);
- String dataQueueSize =
maxWorkQueueSize.getElementsByTagName("maxWorkQueueSize").item(0)
- .getTextContent();
- Long dataQueueSizeL = Long.valueOf(dataQueueSize);
- totalQueueSize = dataQueueSizeL + totalQueueSize;
- if(dataQueueSizeL > maxQueueSize)
- maxQueueSize = dataQueueSizeL;
- if(dataQueueSizeL < minQueueSize || minQueueSize == 0)
- minQueueSize = dataQueueSizeL;
- if (max.compareTo(byteValue) < 0)
- max = byteValue;
-
- if (byteValue.compareTo(min) < 0 || min.compareTo(new
BigDecimal("0.0")) == 0)
- min = byteValue;
-
- totalDataSize = totalDataSize.add(byteValue);
- }
-
- }
-
- System.out.println("Total Bytes Utilized by System=" +
convertBytesToGB(totalDataSize).toPlainString()
- + " GB\nMax Back Pressure Size=" +
convertBytesToGB(max).toPlainString()
- + " GB\nMin Back Pressure Size=" +
convertBytesToGB(min).toPlainString()
- + " GB\nAverage Back Pressure Size="
- + convertBytesToGB(avg.divide(new
BigDecimal(numberOfConnections), DIVIDE_SCALE, RoundingMode.HALF_UP)) + " GB");
- System.out.println("Max Flowfile Queue Size=" + maxQueueSize +
"\nMin Flowfile Queue Size=" + minQueueSize
- + "\nAvg Flowfile Queue Size=" + new
BigDecimal(totalQueueSize).divide(new BigDecimal(numberOfConnections),
DIVIDE_SCALE, RoundingMode.HALF_UP));
- gzipStream.close();
- fileStream.close();
- } catch (Exception e) {
- e.printStackTrace();
- System.out.println("Exception occurred while attempting to parse
flow.xml.gz. Cause: " + e.getCause());
- }
-
- }
-
- private static boolean helpRequested(String[] args) {
- return args.length == 0 || args[0].equalsIgnoreCase("-h") ||
args[0].equalsIgnoreCase("--help");
- }
-
- /**
- *
- * @param value to convert to bytes
- * @return BigDecimal Byte size
- */
- public static BigDecimal convertSizeToByteValue(String value) {
- BigDecimal size = null;
-
- if (value.contains("GB")) {
- String numericValue = value.substring(0, value.indexOf("G") - 1);
- size = new BigDecimal(numericValue).multiply(new
BigDecimal(CONST_BYTES_GB_CONV));
- }
-
- if (value.contains("MB")) {
- String numericValue = value.substring(0, value.indexOf("M") - 1);
- size = new BigDecimal(numericValue).multiply(new
BigDecimal(CONST_BYTES_MB_CONV));
- }
-
- if (value.contains("KB")) {
- String numericValue = value.substring(0, value.indexOf("K") - 1);
- size = new BigDecimal(numericValue).multiply(new
BigDecimal(CONST_BYTES_KB_CONV));
- }
-
- return size;
- }
-
- /**
- * @param bytes to convert to GB
- * @return BigDecimal bytes to GB
- */
- public static BigDecimal convertBytesToGB(BigDecimal bytes) {
- return bytes.divide(new BigDecimal(CONST_BYTES_GB_CONV), DIVIDE_SCALE,
RoundingMode.HALF_UP).stripTrailingZeros();
- }
-
-}
diff --git
a/nifi-toolkit/nifi-toolkit-flowanalyzer/src/test/java/org/apache/nifi/toolkit/FlowAnalyzerDriverTest.java
b/nifi-toolkit/nifi-toolkit-flowanalyzer/src/test/java/org/apache/nifi/toolkit/FlowAnalyzerDriverTest.java
deleted file mode 100644
index cb484c129b..0000000000
---
a/nifi-toolkit/nifi-toolkit-flowanalyzer/src/test/java/org/apache/nifi/toolkit/FlowAnalyzerDriverTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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 regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.toolkit;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.math.BigDecimal;
-
-import org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver;
-import org.junit.jupiter.api.Test;
-
-public class FlowAnalyzerDriverTest {
-
- @Test
- public void testConvertSizeToValue() {
-
- String gbTest = "13 GB";
- String kbTest = "103 KB";
- String mbTest = "20 MB";
-
- BigDecimal gbBigDecimal =
FlowAnalyzerDriver.convertSizeToByteValue(gbTest);
- assertEquals(gbBigDecimal.toPlainString(), "13000000000");
-
- BigDecimal kbBigDecimal =
FlowAnalyzerDriver.convertSizeToByteValue(kbTest);
- assertEquals(kbBigDecimal.toPlainString(), "103000");
-
- BigDecimal mbBigDecimal =
FlowAnalyzerDriver.convertSizeToByteValue(mbTest);
- assertEquals(mbBigDecimal.toPlainString(), "20000000");
- }
-
- @Test
- public void convertBytesToGB() {
-
- BigDecimal gbBigDecimal = new BigDecimal("13000000000");
- BigDecimal kbBigDecimal = new BigDecimal("103000");
- BigDecimal mbBigDecimal = new BigDecimal("20000000");
-
- BigDecimal result = FlowAnalyzerDriver.convertBytesToGB(gbBigDecimal);
- assertEquals("13", result.stripTrailingZeros().toPlainString());
-
- result = FlowAnalyzerDriver.convertBytesToGB(mbBigDecimal);
- assertEquals("0.02", result.stripTrailingZeros().toPlainString());
-
- result = FlowAnalyzerDriver.convertBytesToGB(kbBigDecimal);
- assertEquals("0.000103", result.stripTrailingZeros().toPlainString());
- }
-}
diff --git a/nifi-toolkit/pom.xml b/nifi-toolkit/pom.xml
index 206d24b7a9..71d2103d26 100644
--- a/nifi-toolkit/pom.xml
+++ b/nifi-toolkit/pom.xml
@@ -30,7 +30,6 @@
<module>nifi-toolkit-zookeeper-migrator</module>
<module>nifi-toolkit-flowfile-repo</module>
<module>nifi-toolkit-assembly</module>
- <module>nifi-toolkit-flowanalyzer</module>
<module>nifi-toolkit-cli</module>
<module>nifi-toolkit-api</module>
</modules>
