You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2017/11/08 17:58:14 UTC

[GitHub] nkurihar closed pull request #891: Fixed typo

nkurihar closed pull request #891: Fixed typo
URL: https://github.com/apache/incubator-pulsar/pull/891
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/conf/broker.conf b/conf/broker.conf
index e5a0fd1e4..3a0df5c5a 100644
--- a/conf/broker.conf
+++ b/conf/broker.conf
@@ -368,7 +368,7 @@ defaultRetentionTimeInMinutes=0
 # Default retention size
 defaultRetentionSizeInMB=0
 
-# How often to check cms connection is still alive
+# How often to check whether the connections are still alive
 keepAliveIntervalSeconds=30
 
 # How often broker checks for inactive topics to be deleted (topics with no subscriptions and no one connected)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
index df4be6a6f..f762dc661 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
@@ -191,7 +191,7 @@ protected void handleLookup(CommandLookupTopic lookup) {
                     });
         } else {
             if (log.isDebugEnabled()) {
-                log.debug("[{}] Failed lookup due to too many lookup-requets {}", remoteAddress, topic);
+                log.debug("[{}] Failed lookup due to too many lookup-requests {}", remoteAddress, topic);
             }
             ctx.writeAndFlush(newLookupErrorResponse(ServerError.TooManyRequests,
                     "Failed due to too many pending lookup requests", requestId));
@@ -232,7 +232,7 @@ protected void handlePartitionMetadataRequest(CommandPartitionedTopicMetadata pa
                             });
         } else {
             if (log.isDebugEnabled()) {
-                log.debug("[{}] Failed Partition-Metadata lookup due to too many lookup-requets {}", remoteAddress,
+                log.debug("[{}] Failed Partition-Metadata lookup due to too many lookup-requests {}", remoteAddress,
                         topic);
             }
             ctx.writeAndFlush(newLookupErrorResponse(ServerError.TooManyRequests,
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
index cf5e1eaf2..acd56fe46 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
@@ -77,7 +77,7 @@
     public static final String ATTRIBUTE_PULSAR_NAME = "pulsar";
     public static final String HANDLER_CACHE_CONTROL = "max-age=3600";
     public static final int NUM_ACCEPTORS = 32; // make it configurable?
-    public static final int MAX_CONCURRENT_REQUESTES = 1024; // make it configurable?
+    public static final int MAX_CONCURRENT_REQUESTS = 1024; // make it configurable?
 
     private final PulsarService pulsar;
     private final Server server;
@@ -118,7 +118,7 @@ public WebService(PulsarService pulsar) throws PulsarServerException {
         }
 
         // Limit number of concurrent HTTP connections to avoid getting out of file descriptors
-        connectors.forEach(c -> c.setAcceptQueueSize(WebService.MAX_CONCURRENT_REQUESTES / connectors.size()));
+        connectors.forEach(c -> c.setAcceptQueueSize(WebService.MAX_CONCURRENT_REQUESTS / connectors.size()));
         server.setConnectors(connectors.toArray(new ServerConnector[connectors.size()]));
     }
 
diff --git a/pulsar-client-cpp/tests/BasicEndToEndTest.cc b/pulsar-client-cpp/tests/BasicEndToEndTest.cc
index 9946defb6..b17b3f5e0 100644
--- a/pulsar-client-cpp/tests/BasicEndToEndTest.cc
+++ b/pulsar-client-cpp/tests/BasicEndToEndTest.cc
@@ -871,7 +871,7 @@ TEST(BasicEndToEndTest, testMessageListenerPause)
 
     // Send asynchronously for 3 seconds
     // Expect timeouts since we have set timeout to 1 ms
-    // On receiving timeout send the message using the CMS client IO thread via cb function.
+    // On receiving timeout send the message using the Pulsar client IO thread via cb function.
     for (int i = 0; i<10000; i++) {
         producer.sendAsync(MessageBuilder().build(), boost::bind(resendMessage, _1, _2, producer));
     }
diff --git a/site/_data/config/broker.yaml b/site/_data/config/broker.yaml
index e242915da..3ffe7f5b7 100644
--- a/site/_data/config/broker.yaml
+++ b/site/_data/config/broker.yaml
@@ -280,7 +280,7 @@ configs:
   description: Default retention size
 - name: keepAliveIntervalSeconds
   default: '30'
-  description: How often to check cms connection is still alive
+  description: How often to check whether the connections are still alive
 - name: brokerServicePurgeInactiveFrequencyInSeconds
   default: '60'
   description: How often broker checks for inactive topics to be deleted (topics with no subscriptions and no one connected)
diff --git a/site/docs/latest/advanced/Encryption.md b/site/docs/latest/advanced/Encryption.md
index da6e5bb23..3facac375 100644
--- a/site/docs/latest/advanced/Encryption.md
+++ b/site/docs/latest/advanced/Encryption.md
@@ -165,6 +165,7 @@ Pulsar does not store the encryption key anywhere in the pulsar service. If you
         consumer.acknowledgeCumulative(msg);
         pulsarClient.close();
 ```
+
 ## Key rotation
 Pulsar generates new AES data key every 4 hours or after a certain number of messages are published. The asymmetric public key is automatically fetched by producer every 4 hours by calling CryptoKeyReader::getPublicKey() to retrieve the latest version.
 
diff --git a/site/docs/latest/clients/Java.md b/site/docs/latest/clients/Java.md
index b6e7f46ca..45d55a9b6 100644
--- a/site/docs/latest/clients/Java.md
+++ b/site/docs/latest/clients/Java.md
@@ -246,7 +246,7 @@ To use [Athenz](../../admin/Authz#athenz) as an authentication provider, you nee
 * `tenantDomain`
 * `tenantService`
 * `providerDomain`
-* `privateKeyPath`
+* `privateKey`
 
 You can also set an optional `keyId`. Here's an example configuration:
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services