Revision: d43b91a969bf
Author:   Jean Deruelle <[email protected]>
Date:     Fri Aug 10 07:50:10 2012
Log:      Update Issue 141

Backport to TelScale

Adding Congestion Control Policy
(cherry picked from commit 48aacd1e88b5dd0c99aba74da17a6025aca38753)

http://code.google.com/p/sipservlets/source/detail?r=d43b91a969bf

Modified:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Attribute.java /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Constants.java /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipDefinition.java /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemAdd.java /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemParser.java /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/resources/org/mobicents/as7/LocalDescriptions.properties

=======================================
--- /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Attribute.java Fri Aug 10 07:22:56 2012 +++ /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Attribute.java Fri Aug 10 07:50:10 2012
@@ -46,6 +46,7 @@
     CHECK_INTERVAL(Constants.CHECK_INTERVAL),
     CIPHER_SUITE(Constants.CIPHER_SUITE),
     CONGESTION_CONTROL_INTERVAL(Constants.CONGESTION_CONTROL_INTERVAL),
+    CONGESTION_CONTROL_POLICY(Constants.CONGESTION_CONTROL_POLICY),
     CONCURRENCY_CONTROL_MODE(Constants.CONCURRENCY_CONTROL_MODE),
     DEFAULT_VIRTUAL_SERVER(Constants.DEFAULT_VIRTUAL_SERVER),
     DEFAULT_WEB_MODULE(Constants.DEFAULT_WEB_MODULE),
=======================================
--- /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Constants.java Fri Aug 10 07:22:56 2012 +++ /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/Constants.java Fri Aug 10 07:50:10 2012
@@ -47,6 +47,7 @@
String CANCELED_TIMER_TASKS_PURGE_PERIOD = "canceled-timer-tasks-purge-period";
     String CONCURRENCY_CONTROL_MODE = "concurrency-control-mode";
     String CONGESTION_CONTROL_INTERVAL = "congestion-control-interval";
+    String CONGESTION_CONTROL_POLICY = "congestion-control-policy";
     String CONTAINER = "container";
     String CONTAINER_CONFIG = CONFIGURATION;
     String DEFAULT_VIRTUAL_SERVER = "default-virtual-server";
=======================================
--- /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipDefinition.java Fri Aug 10 07:22:56 2012 +++ /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipDefinition.java Fri Aug 10 07:50:10 2012
@@ -100,6 +100,14 @@
                     //.setValidator(new IntRangeValidator(1, true))
                     .setDefaultValue(new ModelNode(-1))
                     .build();
+ protected static final SimpleAttributeDefinition CONGESTION_CONTROL_POLICY = + new SimpleAttributeDefinitionBuilder(Constants.CONGESTION_CONTROL_POLICY, ModelType.STRING, true)
+                    .setAllowExpression(true)
+                    .setXmlName(Constants.CONGESTION_CONTROL_POLICY)
+                    .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
+                    //.setValidator(new IntRangeValidator(1, true))
+                    .setDefaultValue(new ModelNode("ErrorResponse"))
+                    .build();
     protected static final SimpleAttributeDefinition USE_PRETTY_ENCODING =
new SimpleAttributeDefinitionBuilder(Constants.USE_PRETTY_ENCODING, ModelType.BOOLEAN, true)
                     .setAllowExpression(true)
@@ -196,6 +204,7 @@
registration.registerReadWriteAttribute(SIP_PATH_NAME, null, new ReloadRequiredWriteAttributeHandler(SIP_PATH_NAME)); registration.registerReadWriteAttribute(SIP_APP_DISPATCHER_CLASS, null, new ReloadRequiredWriteAttributeHandler(SIP_APP_DISPATCHER_CLASS)); registration.registerReadWriteAttribute(CONGESTION_CONTROL_INTERVAL, null, new ReloadRequiredWriteAttributeHandler(CONGESTION_CONTROL_INTERVAL)); + registration.registerReadWriteAttribute(CONGESTION_CONTROL_POLICY, null, new ReloadRequiredWriteAttributeHandler(CONGESTION_CONTROL_POLICY)); registration.registerReadWriteAttribute(CONCURRENCY_CONTROL_MODE, null, new ReloadRequiredWriteAttributeHandler(CONCURRENCY_CONTROL_MODE)); registration.registerReadWriteAttribute(USE_PRETTY_ENCODING, null, new ReloadRequiredWriteAttributeHandler(USE_PRETTY_ENCODING)); registration.registerReadWriteAttribute(ADDITIONAL_PARAMETERABLE_HEADERS, null, new ReloadRequiredWriteAttributeHandler(ADDITIONAL_PARAMETERABLE_HEADERS));
=======================================
--- /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java Fri Aug 10 07:22:56 2012 +++ /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java Fri Aug 10 07:50:10 2012
@@ -62,6 +62,7 @@
     final String sipAppDispatcherClass;
     final String additionalParameterableHeaders;
     final int sipCongestionControlInterval;
+    final String congestionControlPolicy;
     final String sipConcurrencyControlMode;
     final boolean usePrettyEncoding;
        final int baseTimerInterval;
@@ -91,7 +92,8 @@
                final String sipPathName,
                String sipAppDispatcherClass,
                String additionalParameterableHeaders,
-               int sipCongestionControlInterval,
+               int sipCongestionControlInterval,
+               String congestionControlPolicy,
                String sipConcurrencyControlMode,
                boolean usePrettyEncoding,
                int baseTimerInterval,
@@ -101,7 +103,7 @@
                boolean dialogPendingRequestChecking,
                int canceledTimerTasksPurgePeriod,
                int memoryThreshold,
-               int backToNormalMemoryThreshold,
+               int backToNormalMemoryThreshold,
                String instanceId) {
 //        this.defaultHost = defaultHost;
 //        this.useNative = useNative;
@@ -111,6 +113,7 @@
        this.sipAppDispatcherClass = sipAppDispatcherClass;
        this.additionalParameterableHeaders = additionalParameterableHeaders;
        this.sipCongestionControlInterval = sipCongestionControlInterval;
+       this.congestionControlPolicy = congestionControlPolicy;
        this.sipConcurrencyControlMode = sipConcurrencyControlMode;
         this.instanceId = instanceId;
         this.usePrettyEncoding = usePrettyEncoding;
@@ -206,6 +209,7 @@
sipService.setCanceledTimerTasksPurgePeriod(canceledTimerTasksPurgePeriod);
         sipService.setMemoryThreshold(memoryThreshold);
sipService.setBackToNormalMemoryThreshold(backToNormalMemoryThreshold);
+        sipService.setCongestionControlPolicy(congestionControlPolicy);

         sipService.setName(JBOSS_SIP);
         sipService.setServer(server);
=======================================
--- /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemAdd.java Fri Aug 10 07:22:56 2012 +++ /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemAdd.java Fri Aug 10 07:50:10 2012
@@ -85,6 +85,7 @@
         SipDefinition.SIP_PATH_NAME.validateAndSet(operation, model);
SipDefinition.SIP_APP_DISPATCHER_CLASS.validateAndSet(operation, model); SipDefinition.CONGESTION_CONTROL_INTERVAL.validateAndSet(operation, model); + SipDefinition.CONGESTION_CONTROL_POLICY.validateAndSet(operation, model); SipDefinition.CONCURRENCY_CONTROL_MODE.validateAndSet(operation, model);
         SipDefinition.USE_PRETTY_ENCODING.validateAndSet(operation, model);
SipDefinition.ADDITIONAL_PARAMETERABLE_HEADERS.validateAndSet(operation, model);
@@ -128,6 +129,9 @@
final ModelNode sipCongestionControlIntervalModel = SipDefinition.CONGESTION_CONTROL_INTERVAL.resolveModelAttribute(context, fullModel); final int sipCongestionControlInterval = sipCongestionControlIntervalModel.isDefined() ? sipCongestionControlIntervalModel.asInt() : -1;

+ final ModelNode congestionControlPolicyModel = SipDefinition.CONGESTION_CONTROL_POLICY.resolveModelAttribute(context, fullModel); + final String congestionControlPolicy = congestionControlPolicyModel.isDefined() ? congestionControlPolicyModel.asString() : "ErrorResponse";
+
final ModelNode sipConcurrencyControlModeModel = SipDefinition.CONCURRENCY_CONTROL_MODE.resolveModelAttribute(context, fullModel); final String sipConcurrencyControlMode = sipConcurrencyControlModeModel.isDefined() ? sipConcurrencyControlModeModel.asString() : null;

@@ -170,7 +174,8 @@
                        sipPathName,
                        sipAppDispatcherClass,
                        additionalParameterableHeaders,
-                       sipCongestionControlInterval,
+                       sipCongestionControlInterval,
+                       congestionControlPolicy,
                        sipConcurrencyControlMode,
                        usePrettyEncoding,
                        baseTimerInterval,
=======================================
--- /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemParser.java Fri Aug 10 07:22:56 2012 +++ /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemParser.java Fri Aug 10 07:50:10 2012
@@ -81,6 +81,7 @@
SipDefinition.SIP_APP_DISPATCHER_CLASS.marshallAsAttribute(node, false, writer); SipDefinition.CONCURRENCY_CONTROL_MODE.marshallAsAttribute(node, false, writer); SipDefinition.CONGESTION_CONTROL_INTERVAL.marshallAsAttribute(node, false, writer); + SipDefinition.CONGESTION_CONTROL_POLICY.marshallAsAttribute(node, false, writer); SipDefinition.USE_PRETTY_ENCODING.marshallAsAttribute(node, false, writer); SipDefinition.ADDITIONAL_PARAMETERABLE_HEADERS.marshallAsAttribute(node, false, writer); SipDefinition.BASE_TIMER_INTERVAL.marshallAsAttribute(node, false, writer);
@@ -133,6 +134,7 @@
                    case DIALOG_PENDING_REQUEST_CHECKING:
                    case CANCELED_TIMER_TASKS_PURGE_PERIOD:
                    case CONGESTION_CONTROL_INTERVAL:
+                   case CONGESTION_CONTROL_POLICY:
                    case MEMORY_THRESHOLD:
                    case BACK_TO_NORMAL_MEMORY_THRESHOLD:
                    case CONCURRENCY_CONTROL_MODE:
=======================================
--- /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/resources/org/mobicents/as7/LocalDescriptions.properties Fri Aug 10 07:22:56 2012 +++ /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/resources/org/mobicents/as7/LocalDescriptions.properties Fri Aug 10 07:50:10 2012
@@ -19,6 +19,7 @@
sip.canceled-timer-tasks-purge-period=Defines a period to due a purge in the container timer schedulers. The purge may prevent excessive memory usage for apps that cancel most of the timers it sets. sip.memory-threshold=Memory Threshold that when reached by the container, the container will start rejecting new incoming requests sip.back-to-normal-memory-threshold=Back To Normal Memory Threshold that when reached by the container, the container will start accepting new incoming requests again +sip.congestion-control-policy=The congestion control policy defines how an incoming message is handled when the server is overloaded

 sip.configuration=The common sip container configuration.

Reply via email to