From f6db37b658e169c9d86a73d66e0772a58fa718ac Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Thu, 21 Jun 2018 00:24:44 -0700 Subject: [PATCH] Fix spelling of "propagate" in various places. One of these is a configuration parameter (introduced in #5429), but it's never been in a release, so I think it's ok to rename it. --- .../main/java/io/druid/utils/CompressionUtils.java | 2 +- docs/content/configuration/broker.md | 2 +- docs/content/configuration/historical.md | 2 +- .../io/druid/server/initialization/ServerConfig.java | 12 ++++++------ .../initialization/jetty/JettyServerModule.java | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/src/main/java/io/druid/utils/CompressionUtils.java b/api/src/main/java/io/druid/utils/CompressionUtils.java index c2e559962db9..6a665d23a414 100644 --- a/api/src/main/java/io/druid/utils/CompressionUtils.java +++ b/api/src/main/java/io/druid/utils/CompressionUtils.java @@ -69,7 +69,7 @@ public static void unzip(InputStream in, File outDir) throws IOException * @param pulledFile The source file * @param outDir The destination directory to put the resulting file * - * @throws IOException on propogated IO exception, IAE if it cannot determine the proper new name for `pulledFile` + * @throws IOException on propagated IO exception, IAE if it cannot determine the proper new name for `pulledFile` */ @Deprecated // See description for alternative public static void gunzip(File pulledFile, File outDir) diff --git a/docs/content/configuration/broker.md b/docs/content/configuration/broker.md index cd074353201f..2d442bff8481 100644 --- a/docs/content/configuration/broker.md +++ b/docs/content/configuration/broker.md @@ -42,7 +42,7 @@ Druid uses Jetty to serve HTTP requests. |`druid.server.http.defaultQueryTimeout`|Query timeout in millis, beyond which unfinished queries will be cancelled|300000| |`druid.server.http.maxScatterGatherBytes`|Maximum number of bytes gathered from data nodes such as historicals and realtime processes to execute a query. This is an advance configuration that allows to protect in case broker is under heavy load and not utilizing the data gathered in memory fast enough and leading to OOMs. This limit can be further reduced at query time using `maxScatterGatherBytes` in the context. Note that having large limit is not necessarily bad if broker is never under heavy concurrent load in which case data gathered is processed quickly and freeing up the memory used.|Long.MAX_VALUE| |`druid.server.http.gracefulShutdownTimeout`|The maximum amount of time Jetty waits after receiving shutdown signal. After this timeout the threads will be forcefully shutdown. This allows any queries that are executing to complete.|`PT0s` (do not wait)| -|`druid.server.http.unannouncePropogationDelay`|How long to wait for zookeeper unannouncements to propgate before shutting down Jetty. This is a minimum and `druid.server.http.gracefulShutdownTimeout` does not start counting down until after this period elapses.|`PT0s` (do not wait)| +|`druid.server.http.unannouncePropagationDelay`|How long to wait for zookeeper unannouncements to propagate before shutting down Jetty. This is a minimum and `druid.server.http.gracefulShutdownTimeout` does not start counting down until after this period elapses.|`PT0s` (do not wait)| |`druid.broker.http.numConnections`|Size of connection pool for the Broker to connect to historical and real-time processes. If there are more queries than this number that all need to speak to the same node, then they will queue up.|20| |`druid.broker.http.compressionCodec`|Compression codec the Broker uses to communicate with historical and real-time processes. May be "gzip" or "identity".|gzip| |`druid.broker.http.readTimeout`|The timeout for data reads from historical and real-time processes.|PT15M| diff --git a/docs/content/configuration/historical.md b/docs/content/configuration/historical.md index 6ad4a3fccdc1..02dddb92e520 100644 --- a/docs/content/configuration/historical.md +++ b/docs/content/configuration/historical.md @@ -55,7 +55,7 @@ Druid uses Jetty to serve HTTP requests. |`druid.server.http.enableRequestLimit`|If enabled, no requests would be queued in jetty queue and "HTTP 429 Too Many Requests" error response would be sent. |false| |`druid.server.http.defaultQueryTimeout`|Query timeout in millis, beyond which unfinished queries will be cancelled|300000| |`druid.server.http.gracefulShutdownTimeout`|The maximum amount of time Jetty waits after receiving shutdown signal. After this timeout the threads will be forcefully shutdown. This allows any queries that are executing to complete.|`PT0s` (do not wait)| -|`druid.server.http.unannouncePropogationDelay`|How long to wait for zookeeper unannouncements to propgate before shutting down Jetty. This is a minimum and `druid.server.http.gracefulShutdownTimeout` does not start counting down until after this period elapses.|`PT0s` (do not wait)| +|`druid.server.http.unannouncePropagationDelay`|How long to wait for zookeeper unannouncements to propagate before shutting down Jetty. This is a minimum and `druid.server.http.gracefulShutdownTimeout` does not start counting down until after this period elapses.|`PT0s` (do not wait)| |`druid.server.http.maxQueryTimeout`|Maximum allowed value (in milliseconds) for `timeout` parameter. See [query-context](query-context.html) to know more about `timeout`. Query is rejected if the query context `timeout` is greater than this value. |Long.MAX_VALUE| |`druid.server.http.maxRequestHeaderSize`|Maximum size of a request header in bytes. Larger headers consume more memory and can make a server more vulnerable to denial of service attacks.|8 * 1024| diff --git a/server/src/main/java/io/druid/server/initialization/ServerConfig.java b/server/src/main/java/io/druid/server/initialization/ServerConfig.java index 43ba7f812c7e..d96724b14837 100644 --- a/server/src/main/java/io/druid/server/initialization/ServerConfig.java +++ b/server/src/main/java/io/druid/server/initialization/ServerConfig.java @@ -71,7 +71,7 @@ public class ServerConfig @JsonProperty @NotNull - private Period unannouncePropogationDelay = Period.ZERO; + private Period unannouncePropagationDelay = Period.ZERO; @JsonProperty @Min(0) @@ -127,9 +127,9 @@ public Period getGracefulShutdownTimeout() return gracefulShutdownTimeout; } - public Period getUnannouncePropogationDelay() + public Period getUnannouncePropagationDelay() { - return unannouncePropogationDelay; + return unannouncePropagationDelay; } public int getInflateBufferSize() @@ -164,7 +164,7 @@ public boolean equals(Object o) compressionLevel == that.compressionLevel && Objects.equals(maxIdleTime, that.maxIdleTime) && Objects.equals(gracefulShutdownTimeout, that.gracefulShutdownTimeout) && - Objects.equals(unannouncePropogationDelay, that.unannouncePropogationDelay); + Objects.equals(unannouncePropagationDelay, that.unannouncePropagationDelay); } @Override @@ -181,7 +181,7 @@ public int hashCode() maxQueryTimeout, maxRequestHeaderSize, gracefulShutdownTimeout, - unannouncePropogationDelay, + unannouncePropagationDelay, inflateBufferSize, compressionLevel ); @@ -200,7 +200,7 @@ public String toString() ", maxQueryTimeout=" + maxQueryTimeout + ", maxRequestHeaderSize=" + maxRequestHeaderSize + ", gracefulShutdownTimeout=" + gracefulShutdownTimeout + - ", unannouncePropogationDelay=" + unannouncePropogationDelay + + ", unannouncePropagationDelay=" + unannouncePropagationDelay + ", inflateBufferSize=" + inflateBufferSize + ", compressionLevel=" + compressionLevel + '}'; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/JettyServerModule.java b/server/src/main/java/io/druid/server/initialization/jetty/JettyServerModule.java index b4a5cc44f329..f7be347ad7bd 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/JettyServerModule.java +++ b/server/src/main/java/io/druid/server/initialization/jetty/JettyServerModule.java @@ -376,9 +376,9 @@ public void start() throws Exception public void stop() { try { - final long unannounceDelay = config.getUnannouncePropogationDelay().toStandardDuration().getMillis(); + final long unannounceDelay = config.getUnannouncePropagationDelay().toStandardDuration().getMillis(); if (unannounceDelay > 0) { - log.info("Waiting %s ms for unannouncement to propogate.", unannounceDelay); + log.info("Waiting %s ms for unannouncement to propagate.", unannounceDelay); Thread.sleep(unannounceDelay); } else { log.debug("Skipping unannounce wait.");