migrated new kernel and mb version

2025-09-16 23:32:19 +00:00 · 2017-06-01 10:47:59 +05:30 · 2017-06-01 10:47:59 +05:30 · 80ecba8528
commit 80ecba8528
parent 1a5c3ab51f
14 changed files with 511 additions and 475 deletions
--- a/modules/distribution/src/analytics/conf/log4j.properties
+++ b/modules/distribution/src/analytics/conf/log4j.properties
@ -86,6 +86,9 @@ log4j.logger.org.spark-project=WARN
 log4j.logger.akka=WARN
 log4j.logger.org.apache.spark.util.ClosureCleaner=ERROR

+# uncomment the following logs to see http calls headers and messages
+#log4j.logger.feign=DEBUG
+
 log4j.additivity.org.apache.axis2.clustering=false
 log4j.additivity.com.atomikos=false
 log4j.additivity.org.apache=false
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@ -21,7 +21,7 @@ product.key=IoT
 product.version=3.1.0-SNAPSHOT
 product.doc.version=310

-carbon.version=4.4.14
+carbon.version=4.4.16
 default.server.role=IoTServer
 cep.server.role=ComplexEventProcessor
 das.server.role=DataAnalyticsServer
--- a/modules/distribution/src/broker/conf/broker.xml
+++ b/modules/distribution/src/broker/conf/broker.xml
@ -43,7 +43,7 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 		<clusterNotificationTimeout>10</clusterNotificationTimeout>

 		<!-- Configurations related RDBMS based coordination algorithm -->
-        <rdbmsBasedCoordination enabled="false">
+		<rdbmsBasedCoordination enabled="true">
 			<!-- Heartbeat interval used in the RDBMS base coordination algorithm in milliseconds -->
 			<heartbeatInterval>5000</heartbeatInterval>

@ -58,7 +58,7 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 		<!-- Enabling this will make the cluster notifications such as Queue changes(additions and deletions),
 		Subscription changes, etc. sent within the cluster be synchronized using RDBMS. If set to false, Hazelcast
 		will be used for this purpose.-->
-        <RDBMSBasedClusterEventSynchronization enabled="false">
+		<rdbmsBasedClusterEventSynchronization enabled="true">

 			<!--Specifies the interval at which, the cluster events will be read from the database. Needs to be
 			declared in milliseconds. Setting this to a very low value could downgrade the performance where as
@ -66,7 +66,7 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 			all the nodes in a cluster.-->
 			<eventSyncInterval>1000</eventSyncInterval>

-        </RDBMSBasedClusterEventSynchronization>
+		</rdbmsBasedClusterEventSynchronization>
 	</coordination>

 	<!-- You can enable/disable specific messaging transports in this section. By default all
@ -95,7 +95,7 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 			<allowSharedTopicSubscriptions>false</allowSharedTopicSubscriptions>
 			<allowStrictNameValidation>true</allowStrictNameValidation>

-            <!-- Refer conf/advanced/qpid-config.xml for further AMQP-specific configurations.-->
+			<!-- Refer repository/conf/advanced/qpid-config.xml for further AMQP-specific configurations.-->
 		</amqp>
 		<mqtt enabled="true">
 			<bindAddress>0.0.0.0</bindAddress>
@ -117,8 +117,7 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c

 			<!--All receiving events/messages will be in this ring buffer. Ring buffer size
 			of MQTT inbound event disruptor. Default is set to 32768 (1024 * 32)
-            Having a large ring buffer wi
-            ll have a increase memory usage and will improve performance
+			Having a large ring buffer will have a increase memory usage and will improve performance
 			and vise versa -->
 			<inboundBufferSize>32768</inboundBufferSize>

@ -211,7 +210,7 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 	by pointing to the correct data source by updating the property "dataSource".

 	Data source entry should be present in
-    <MB_HOME>/conf/datasources/master-datasources.xml.
+	<MB_HOME>/repository/conf/datasources/master-datasources.xml.

 	-->
 	<persistence>
@ -270,10 +269,14 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 	<!--Publisher transaction related configurations.-->
 	<transaction>

-        <!--Maximum batch size (Messages) for a transaction. Exceeding this limit will result
-        in a failure in the subsequent commit request. Default is set to 10MB. Limit is
-        calculated considering the payload of messages-->
-        <maxBatchSizeInBytes>10000000</maxBatchSizeInBytes>
+		<!--Maximum batch size (Messages) in kilobytes for a transaction. Exceeding this limit will
+		 result in a failure in the subsequent commit (or prepare) request. Default is set to 1MB.
+		 Limit is calculated considering the payload of messages.-->
+		<maxBatchSizeInKB>10240</maxBatchSizeInKB>
+
+		<!-- Maximum number of parallel dtx enabled channel count. Distributed transaction
+		 requests exceeding this limit will fail. -->
+		<maxParallelDtxChannels>20</maxParallelDtxChannels>
 	</transaction>

 	<!-- This section allows you to tweak memory and processor allocations used by WSO2 MB.
@ -282,6 +285,11 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 	<performanceTuning>

 		<slots>
+
+			<!--Rough estimate for size of a slot. What is meant by size is the number of messages
+			contained within bounties of a slot. -->
+			<windowSize>1000</windowSize>
+
 			<!--
 			If message publishers are slow, time taken to fill the slot (up to <windowSize>) will be longer.
 			This will add an latency to messages. Therefore broker will mark the slot as
@ -290,17 +298,27 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 			-->
 			<messageAccumulationTimeout>2000</messageAccumulationTimeout>

-            <!--Rough estimate for size of a slot-->
-            <windowSize>1000</windowSize>
-
 			<!-- Time interval which broker check for slots that can be marked as 'ready to deliver'
 				 (- slots which have a aged more than 'messageAccumulationTimeout')
 				 NOTE: specified in milliseconds.
 			-->
-            <timerPeriod>1000</timerPeriod>
+			<maxSubmitDelay>1000</maxSubmitDelay>

-            <!--Number of SlotDeliveryWorker threads that should be started-->
-            <workerThreadCount>5</workerThreadCount>
+			<!--Number of MessageDeliveryWorker threads that should be started-->
+			<deliveryThreadCount>5</deliveryThreadCount>
+
+			<!-- Number of parallel threads to execute slot deletion task. Increasing this value will remove slots
+				 whose messages are read/delivered to consumers/acknowledged faster reducing heap memory used by
+				 server.-->
+			<deleteThreadCount>5</deleteThreadCount>
+
+			<!-- Max number of pending message count to delete per Slot Deleting Task. This config is used to raise
+			 a WARN when pending scheduled number of slots exceeds this limit (indicate of an  issue that can lead to
+			 message accumulation on server.-->
+			<SlotDeleteQueueDepthWarningThreshold>1000</SlotDeleteQueueDepthWarningThreshold>
+
+			<!-- Maximum number of thrift client connections that should be created in the thrift connection pool -->
+			<thriftClientPoolSize>10</thriftClientPoolSize>

 		</slots>

@ -521,11 +539,6 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 		</bufferBased>
 	</flowControl>

-    <slotManagement>
-        <!--Set slot storage mode (RDBMS/HazelCast)-->
-        <storage>RDBMS</storage>
-    </slotManagement>
-	
 	<!--
 	Message broker keeps track of all messages it has received as groups. These groups are termed
 	'Slots' (To know more information about Slots and message broker install please refer to online wiki).
--- a/modules/distribution/src/broker/conf/log4j.properties
+++ b/modules/distribution/src/broker/conf/log4j.properties
@ -144,6 +144,9 @@ log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S]
 log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace
 log4j.appender.CARBON_MEMORY.threshold=DEBUG

+# uncomment the following logs to see http calls headers and messages
+#log4j.logger.feign=DEBUG
+
 # CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout.
 log4j.appender.CARBON_LOGFILE=org.apache.log4j.DailyRollingFileAppender
 # Log file will be overridden by the configuration setting in the DB
--- a/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
+++ b/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
@ -36,9 +36,7 @@
 	</ProvisioningConnectorConfigs>
 	<!--<DefaultProvisioningConnectorConfig></DefaultProvisioningConnectorConfig>-->
 	<ClaimConfig></ClaimConfig>
-	<Certificate>
-MIICNTCCAZ6gAwIBAgIES343gjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxDTALBgNVBAoMBFdTTzIxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xMDAyMTkwNzAyMjZaFw0zNTAyMTMwNzAyMjZaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzENMAsGA1UECgwEV1NPMjESMBAGA1UEAwwJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUp/oV1vWc8/TkQSiAvTousMzOM4asB2iltr2QKozni5aVFu818MpOLZIr8LMnTzWllJvvaA5RAAdpbECb+48FjbBe0hseUdN5HpwvnH/DW8ZccGvk53I6Orq7hLCv1ZHtuOCokghz/ATrhyPq+QktMfXnRS4HrKGJTzxaCcU7OQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcNAQEFBQADgYEAW5wPR7cr1LAdq+IrR44iQlRG5ITCZXY9hI0PygLP2rHANh+PYfTmxbuOnykNGyhM6FjFLbW2uZHQTY1jMrPprjOrmyK5sjJRO4d1DeGHT/YnIjs9JogRKv4XHECwLtIVdAbIdWHEtVZJyMSktcyysFcvuhPQK8Qc/E/Wq8uHSCo=
-	</Certificate>
+	<Certificate>MIIDSTCCAjGgAwIBAgIERUubMzANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxDTALBgNVBAoTBFdTTzIxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNzAzMjEwOTEzMDdaFw0xNzA2MTkwOTEzMDdaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzENMAsGA1UEChMEV1NPMjESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu8lfLCQV2hbiz8OGA8baKI1E1cgE/QLKefa4Od2G2KextaAwSESr5ICakVX8w6tU5+IhKYQQKt9U3/U0ae9tXf04g6iWh0dRllsr9mOgjSZxQK09/ygUsFH8syL5aD3heRUYzJWZ/KOsd57BXuI2QZnuEjN0g0+5jNvnswfwD/tM01totaJpI3xN+2JZsaBRCc0G5yA/pdW83Aa4IE30EL57wkK7u8YDl3UTcmi+HO74XQmK1VEqSnA+/mFo3M16cRlm2PTZ2Z1E5gd4j+5sV1P5v63uqyFniEU0zPXforBb06pgSBoIRQBintSSDyEmyuVzW0pc2eYC5Dhfgk337QIDAQABoyEwHzAdBgNVHQ4EFgQU4lneZCvKn04NH5DtJItdRXdXankwDQYJKoZIhvcNAQELBQADggEBAEnCNr0JEcAxtF/ypwGgFu1rYOv3i02PB4jDWbFj8s58l1zF1tMr480khVX4d3AmLjsUpvV+Jg83JFIk1rJFLEb48EFv0nJ/G7pTQrCypNKozyuyLzx5UvKNFBMmnGvkHVqt6j4MSiOjnRdlo7ofDluA/umSkSf/VmsOIZ+5610pCJpahnPUkb8GYK0HcwNV2NLU/0X4nSjKjGwWYv0tX8XW8RwJKb/r0GDehA8PESi76XOVrpXSjP9WPK8XaK//8B0SH3hm0xpzmSQYgtkNQwP2MqBe/ZEUuKxrn3pP6oxo9RxeSIQ8dTLiBA/mcsBmAlpQPPi0LqqDKpkyHt8Ar2w=</Certificate>
 	<PermissionAndRoleConfig></PermissionAndRoleConfig>
 	<JustInTimeProvisioningConfig></JustInTimeProvisioningConfig>
 </IdentityProvider>
--- a/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
+++ b/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
--- a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
+++ b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
--- a/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks
+++ b/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks
--- a/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks
+++ b/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks
--- a/modules/p2-profile/analytics-profile/carbon.product
+++ b/modules/p2-profile/analytics-profile/carbon.product
@ -13,7 +13,7 @@
   </plugins>

   <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.14"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
   </features>

  <configurations>
--- a/modules/p2-profile/broker-profile/carbon.product
+++ b/modules/p2-profile/broker-profile/carbon.product
@ -13,7 +13,7 @@
   </plugins>

   <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.14"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
   </features>

  <configurations>
--- a/modules/p2-profile/iot-core-profile/carbon.product
+++ b/modules/p2-profile/iot-core-profile/carbon.product
@ -14,7 +14,7 @@ version="4.4.14" useFeatures="true" includeLaunchers="true">
   </plugins>

   <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.14"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
   </features>

  <configurations>
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@ -182,6 +182,9 @@
                                <featureArtifactDef>
                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version}
                                </featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
+								</featureArtifactDef>
                                <!-- End of Device Management Plugin Features -->

                                <!-- IoT Device Management Features -->
@ -1016,6 +1019,10 @@
                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
                                    <version>${carbon.device.mgt.plugin.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <!-- End of Device Management Features -->
                                <feature>
                                    <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@ -1136,6 +1143,10 @@
                                    <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
                                    <version>${carbon.analytics.common.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
+									<version>${carbon.analytics.common.version}</version>
+								</feature>
                                <!-- End of Carbon Analytics Common Features -->

                                <feature>
@ -2015,6 +2026,10 @@
                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                    <version>${carbon.device.mgt.plugin.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <feature>
                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
@ -2647,6 +2662,10 @@
                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                    <version>${carbon.device.mgt.plugin.version}</version>
                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                <feature>
                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                    <version>${carbon.device.mgt.version}</version>
--- a/pom.xml
+++ b/pom.xml
@ -1440,7 +1440,7 @@
    <properties>

        <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.14</carbon.kernel.version>
+        <carbon.kernel.version>4.4.16</carbon.kernel.version>
        <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
        <carbon.ui.menu.stratos.version>2.2.0</carbon.ui.menu.stratos.version>

@ -1512,7 +1512,7 @@

        <!-- Carbon Device Management -->

-        <carbon.device.mgt.version>2.0.68</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.69-SNAPSHOT</carbon.device.mgt.version>
        <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>

        <!-- IOT Device Management -->
@ -1520,7 +1520,7 @@

        <!-- Carbon Device Management Plugins-->

-        <carbon.device.mgt.plugin.version>3.0.36</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.37-SNAPSHOT</carbon.device.mgt.plugin.version>

        <!-- API Management -->
        <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>
@ -1551,8 +1551,8 @@

        <!-- IoT Broker Dependencies -->
        <product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
-        <andes.version>3.1.15</andes.version>
-        <carbon.messaging.version>3.1.17</carbon.messaging.version>
+        <andes.version>3.2.19</andes.version>
+        <carbon.messaging.version>3.2.15</carbon.messaging.version>

        <!-- Third Party Dependencies-->
        <spongycastle.version>1.51.0.0</spongycastle.version>