This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch flume-1.10.0
in repository https://gitbox.apache.org/repos/asf/flume.git
The following commit(s) were added to refs/heads/flume-1.10.0 by this push:
new 2c269b4c Fix command line option conflicts
2c269b4c is described below
commit 2c269b4c5f970c50f7ecf2144fe4bb7e6b10b9f8
Author: Ralph Goers <rgo...@apache.org>
AuthorDate: Wed Jun 1 21:02:33 2022 -0700
Fix command line option conflicts
---
bin/flume-ng | 8 ++++++--
flume-ng-dist/pom.xml | 4 ----
.../src/main/java/org/apache/flume/node/Application.java | 8 ++++----
.../main/java/org/apache/flume/node/HttpConfigurationSource.java | 4 ++++
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/bin/flume-ng b/bin/flume-ng
index 9bea01f5..d402912e 100755
--- a/bin/flume-ng
+++ b/bin/flume-ng
@@ -164,7 +164,11 @@ commands:
version show Flume version info
global options:
- --conf,-c <conf> use configs in <conf> directory
+ --conf-file,-f <conf> use configs in <conf> directory
+ --conf-uri, -u <conf> use configs located at <conf>
+ --conf-provider, -prov <provider-class> use the configuration provided by
the provider class
+ --conf-user, -user <user> the user for accessing the configuration uri
+ --conf-oassword, -pwd <password> the password for accessing the
configuration uri
--classpath,-C <cp> append to the classpath
--dryrun,-d do not actually start Flume, just print the command
--plugins-path <dirs> colon-separated list of plugins.d directories. See
the
@@ -175,7 +179,7 @@ global options:
agent options:
--name,-n <name> the name of this agent (required)
- --conf-file,-f <file> specify a config file (required if -z missing)
+ --conf-file,-f <file> specify a config file (required if -z, -u, and
-prov are missing)
--zkConnString,-z <str> specify the ZooKeeper connection to use (required
if -f missing)
--zkBasePath,-p <path> specify the base path in ZooKeeper for agent
configs
--no-reload-conf do not reload config file if changed
diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml
index b5f0495c..5ca3783e 100644
--- a/flume-ng-dist/pom.xml
+++ b/flume-ng-dist/pom.xml
@@ -151,10 +151,6 @@
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-kafka-sink</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.flume.flume-ng-sinks</groupId>
- <artifactId>flume-dataset-sink</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-hive-sink</artifactId>
diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/Application.java
b/flume-ng-node/src/main/java/org/apache/flume/node/Application.java
index e30ede84..28df67de 100644
--- a/flume-ng-node/src/main/java/org/apache/flume/node/Application.java
+++ b/flume-ng-node/src/main/java/org/apache/flume/node/Application.java
@@ -320,16 +320,16 @@ public class Application {
option.setRequired(false);
options.addOption(option);
- option = new Option("c", "conf-provider", true,
+ option = new Option("prov", "conf-provider", true,
"specify a configuration provider class (required if -f, -u, and
-z are missing)");
option.setRequired(false);
options.addOption(option);
- option = new Option("n", "conf-user", true, "user name to access
configuration uri");
+ option = new Option("user", "conf-user", true, "user name to access
configuration uri");
option.setRequired(false);
options.addOption(option);
- option = new Option("p", "conf-password", true, "password to access
configuration uri");
+ option = new Option("pwd", "conf-password", true, "password to access
configuration uri");
option.setRequired(false);
options.addOption(option);
@@ -395,7 +395,7 @@ public class Application {
}
}
- if (commandLine.hasOption("c") ||
commandLine.hasOption("conf-provider")) {
+ if (commandLine.hasOption("prov") ||
commandLine.hasOption("conf-provider")) {
String className = commandLine.getOptionValue("conf-provider");
try {
Class<?> clazz =
Application.class.getClassLoader().loadClass(className);
diff --git
a/flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSource.java
b/flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSource.java
index a877d852..e9a395ca 100644
---
a/flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSource.java
+++
b/flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSource.java
@@ -37,6 +37,7 @@ public class HttpConfigurationSource implements
ConfigurationSource {
private static final Logger LOGGER =
LoggerFactory.getLogger(HttpConfigurationSource.class);
private static final int NOT_MODIFIED = 304;
private static final int NOT_AUTHORIZED = 401;
+ private static final int NOT_FOUND = 404;
private static final int OK = 200;
private static final int BUF_SIZE = 1024;
@@ -119,6 +120,9 @@ public class HttpConfigurationSource implements
ConfigurationSource {
throw new ConfigurationException("Unable to access " +
uri.toString(), e);
}
}
+ case NOT_FOUND: {
+ throw new ConfigurationException("Unable to locate " +
uri.toString());
+ }
case NOT_AUTHORIZED: {
throw new ConfigurationException("Authorization failed");
}
