hanm commented on a change in pull request #1037: ZOOKEEPER-3492: Add weights
to server side connection throttling
URL: https://github.com/apache/zookeeper/pull/1037#discussion_r313117213
##########
File path:
zookeeper-server/src/main/java/org/apache/zookeeper/server/BlueThrottle.java
##########
@@ -86,36 +90,106 @@
Random rng;
public static final String CONNECTION_THROTTLE_TOKENS =
"zookeeper.connection_throttle_tokens";
- public static final int DEFAULT_CONNECTION_THROTTLE_TOKENS;
+ private static final int DEFAULT_CONNECTION_THROTTLE_TOKENS;
public static final String CONNECTION_THROTTLE_FILL_TIME =
"zookeeper.connection_throttle_fill_time";
- public static final int DEFAULT_CONNECTION_THROTTLE_FILL_TIME;
+ private static final int DEFAULT_CONNECTION_THROTTLE_FILL_TIME;
public static final String CONNECTION_THROTTLE_FILL_COUNT =
"zookeeper.connection_throttle_fill_count";
- public static final int DEFAULT_CONNECTION_THROTTLE_FILL_COUNT;
+ private static final int DEFAULT_CONNECTION_THROTTLE_FILL_COUNT;
public static final String CONNECTION_THROTTLE_FREEZE_TIME =
"zookeeper.connection_throttle_freeze_time";
- public static final int DEFAULT_CONNECTION_THROTTLE_FREEZE_TIME;
+ private static final int DEFAULT_CONNECTION_THROTTLE_FREEZE_TIME;
public static final String CONNECTION_THROTTLE_DROP_INCREASE =
"zookeeper.connection_throttle_drop_increase";
- public static final double DEFAULT_CONNECTION_THROTTLE_DROP_INCREASE;
+ private static final double DEFAULT_CONNECTION_THROTTLE_DROP_INCREASE;
public static final String CONNECTION_THROTTLE_DROP_DECREASE =
"zookeeper.connection_throttle_drop_decrease";
- public static final double DEFAULT_CONNECTION_THROTTLE_DROP_DECREASE;
+ private static final double DEFAULT_CONNECTION_THROTTLE_DROP_DECREASE;
public static final String CONNECTION_THROTTLE_DECREASE_RATIO =
"zookeeper.connection_throttle_decrease_ratio";
- public static final double DEFAULT_CONNECTION_THROTTLE_DECREASE_RATIO;
+ private static final double DEFAULT_CONNECTION_THROTTLE_DECREASE_RATIO;
+
+ public static final String WEIGHED_CONNECTION_THROTTLE =
"zookeeper.connection_throttle_weight_enabled";
+ private static boolean connectionWeightEnabled;
+
+ public static final String GLOBAL_SESSION_WEIGHT =
"zookeeper.connection_throttle_global_session_weight";
+ private static final int DEFAULT_GLOBAL_SESSION_WEIGHT;
+
+ public static final String LOCAL_SESSION_WEIGHT =
"zookeeper.connection_throttle_local_session_weight";
+ private static final int DEFAULT_LOCAL_SESSION_WEIGHT;
+ public static final String RENEW_SESSION_WEIGHT =
"zookeeper.connection_throttle_renew_session_weight";
+ private static final int DEFAULT_RENEW_SESSION_WEIGHT;
+
+ // for unit tests only
+ protected static void setConnectionWeightEnabled(boolean enabled) {
+ connectionWeightEnabled = enabled;
+ logWeighedThrottlingSetting();
+ }
+
+ private static void logWeighedThrottlingSetting() {
+ if (connectionWeightEnabled) {
+ LOG.info("Weighed connection throttling is enabled. " +
+ "But it will only be effective if connection throttling is
enabled");
+ LOG.info(
+ "The weights for different session types are: global {}
renew {} local {}",
+ DEFAULT_GLOBAL_SESSION_WEIGHT,
+ DEFAULT_RENEW_SESSION_WEIGHT,
+ DEFAULT_LOCAL_SESSION_WEIGHT
+ );
+ } else {
+ LOG.info("Weighed connection throttling is disabled");
+ }
+ }
static {
- DEFAULT_CONNECTION_THROTTLE_TOKENS =
Integer.getInteger(CONNECTION_THROTTLE_TOKENS, 0);
- DEFAULT_CONNECTION_THROTTLE_FILL_TIME =
Integer.getInteger(CONNECTION_THROTTLE_FILL_TIME, 1);
- DEFAULT_CONNECTION_THROTTLE_FILL_COUNT =
Integer.getInteger(CONNECTION_THROTTLE_FILL_COUNT, 1);
+ int tokens = Integer.getInteger(CONNECTION_THROTTLE_TOKENS, 0);
+ int fillCount = Integer.getInteger(CONNECTION_THROTTLE_FILL_COUNT, 1);
+
+ connectionWeightEnabled =
Boolean.getBoolean(WEIGHED_CONNECTION_THROTTLE);
+
+ // if not specified, the weights for a global session, a local
session, and a renew session
+ // are 3, 1, 2 respectively. The weight for a global session is 3
because in our connection benchmarking,
+ // the throughput of global sessions is about one third of that of
local sessions. Renewing a session
+ // requires is more expensive than establishing a local session and
cheaper than creating a global session so
+ // its default weight is set to 2.
+ int setting = Integer.getInteger(GLOBAL_SESSION_WEIGHT, 3);
+ if (setting <= 0) {
+ LOG.warn("Invalid global session weight {}. It should be larger
than 0");
Review comment:
Missing the log parameter (the intention was to print `setting`?).
Similar for the subsequent `LOG.warn` for `LOCAL_SESSION_WEIGHT` and
`RENEW_SESSION_WEIGHT`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
