You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/02/01 16:32:46 UTC
[1/3] cxf git commit: Adding a basic Throttling manager
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 31d9b4548 -> ad577419d
Adding a basic Throttling manager
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8781a1c0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8781a1c0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8781a1c0
Branch: refs/heads/3.1.x-fixes
Commit: 8781a1c0cfea708e3915e72b83c50877969774a2
Parents: 31d9b45
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Feb 1 15:28:35 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Feb 1 15:32:26 2016 +0000
----------------------------------------------------------------------
.../cxf/throttling/SimpleThrottlingManager.java | 63 ++++++++++++++++++++
.../cxf/throttling/ThrottlingCounter.java | 32 ++++++++++
.../ThrottlingResponseInterceptor.java | 4 ++
3 files changed, 99 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8781a1c0/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
new file mode 100644
index 0000000..7fefbe9
--- /dev/null
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
@@ -0,0 +1,63 @@
+/**
+ * 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.cxf.throttling;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.Phase;
+
+/**
+ * Suspends or aborts the requests if the threshold has been reached
+ */
+public class SimpleThrottlingManager extends ThrottleResponse implements ThrottlingManager {
+ private static final String THROTTLED_KEY = "THROTTLED";
+
+ private int threshold;
+ private ThrottlingCounter counter = new ThrottlingCounter();
+
+ @Override
+ public List<String> getDecisionPhases() {
+ return Collections.singletonList(Phase.PRE_STREAM);
+ }
+
+ @Override
+ public ThrottleResponse getThrottleResponse(String phase, Message m) {
+ if (m.containsKey(THROTTLED_KEY)) {
+ return null;
+ }
+ m.put(ThrottlingCounter.class, counter);
+ if (counter.incrementAndGet() >= threshold) {
+ m.put(THROTTLED_KEY, true);
+ return this;
+ } else {
+ return null;
+ }
+ }
+
+ public int getThreshold() {
+ return threshold;
+ }
+
+ public void setThreshold(int threshold) {
+ this.threshold = threshold;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8781a1c0/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingCounter.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingCounter.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingCounter.java
new file mode 100644
index 0000000..1901bc6
--- /dev/null
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingCounter.java
@@ -0,0 +1,32 @@
+/**
+ * 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.cxf.throttling;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class ThrottlingCounter {
+ private static final AtomicInteger COUNTER = new AtomicInteger();
+ public int incrementAndGet() {
+ return COUNTER.incrementAndGet();
+ }
+ public int decrementAndGet() {
+ return COUNTER.decrementAndGet();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8781a1c0/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
index 9992abd..96a862b 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
@@ -69,5 +69,9 @@ public class ThrottlingResponseInterceptor extends AbstractPhaseInterceptor<Mess
headers.put("Retry-After", Collections.singletonList(retryAfter));
}
}
+ ThrottlingCounter tCounter = message.getExchange().get(ThrottlingCounter.class);
+ if (tCounter != null) {
+ tCounter.decrementAndGet();
+ }
}
}
[2/3] cxf git commit: Setting the manager on the exchange
Posted by se...@apache.org.
Setting the manager on the exchange
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7b004fe3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7b004fe3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7b004fe3
Branch: refs/heads/3.1.x-fixes
Commit: 7b004fe38800411ab8d2b693140b6b0e36cf5e48
Parents: 8781a1c
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Feb 1 15:29:21 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Feb 1 15:32:27 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/throttling/SimpleThrottlingManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7b004fe3/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
index 7fefbe9..7dd8498 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
@@ -45,7 +45,7 @@ public class SimpleThrottlingManager extends ThrottleResponse implements Throttl
}
m.put(ThrottlingCounter.class, counter);
if (counter.incrementAndGet() >= threshold) {
- m.put(THROTTLED_KEY, true);
+ m.getExchange().put(THROTTLED_KEY, true);
return this;
} else {
return null;
[3/3] cxf git commit: Fixing the last commit
Posted by se...@apache.org.
Fixing the last commit
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ad577419
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ad577419
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ad577419
Branch: refs/heads/3.1.x-fixes
Commit: ad577419dd39b1414080e6b34ed75db64254a150
Parents: 7b004fe
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Feb 1 15:31:02 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Feb 1 15:32:27 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/throttling/SimpleThrottlingManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ad577419/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
index 7dd8498..7c5ec84 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
@@ -43,9 +43,9 @@ public class SimpleThrottlingManager extends ThrottleResponse implements Throttl
if (m.containsKey(THROTTLED_KEY)) {
return null;
}
- m.put(ThrottlingCounter.class, counter);
+ m.getExchange().put(ThrottlingCounter.class, counter);
if (counter.incrementAndGet() >= threshold) {
- m.getExchange().put(THROTTLED_KEY, true);
+ m.put(THROTTLED_KEY, true);
return this;
} else {
return null;