You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/12/03 20:08:55 UTC
svn commit: r1209982 - in /karaf/cellar/branches/cellar-2.2.x: ./
hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/
hazelcast/src/main/resources/OSGI-INF/blueprint/
Author: iocanel
Date: Sat Dec 3 19:08:55 2011
New Revision: 1209982
URL: http://svn.apache.org/viewvc?rev=1209982&view=rev
Log:
Merged from trunk
[KARAF-1082] HazelcastGroupManager now properlly syncs the group configuration from hazelcast to config admin and vice versa. [from revision 1209969]
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 3 19:08:55 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090,1202105,1202108,1202111,1203975,1204173,1204184,1204209,1205187,1209264,1209753,1209755,1209757,1209964,1209966
+/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090,1202105,1202108,1202111,1203975,1204173,1204184,1204209,1205187,1209264,1209753,1209755,1209757,1209964,1209966,1209969
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java?rev=1209982&r1=1209981&r2=1209982&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java Sat Dec 3 19:08:55 2011
@@ -19,6 +19,7 @@ package org.apache.karaf.cellar.hazelcas
public class Constants {
public static final String SEPARATOR = ".";
+ public static final String CONFIG = "config";
public static final String TOPIC = "org.apache.karaf.cellar.event.topic";
public static final String QUEUE = "org.apache.karaf.cellar.event.queue";
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1209982&r1=1209981&r2=1209982&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java Sat Dec 3 19:08:55 2011
@@ -24,7 +24,10 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import com.hazelcast.core.Cluster;
+import com.hazelcast.core.EntryEvent;
+import com.hazelcast.core.EntryListener;
import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.core.IMap;
import com.hazelcast.core.Member;
import org.apache.karaf.cellar.core.Configurations;
import org.apache.karaf.cellar.core.Group;
@@ -41,16 +44,21 @@ import org.osgi.framework.ServiceReferen
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.cm.ConfigurationEvent;
+import org.osgi.service.cm.ConfigurationListener;
import org.slf4j.Logger;
/**
* Hazelcast group manager.
+ * The role of this class is to provide means of creating groups, setting nodes to groups etc.
+ * Keep in sync the distributed group configuration with the locally persisted.
*/
-public class HazelcastGroupManager implements GroupManager {
+public class HazelcastGroupManager implements GroupManager, EntryListener, ConfigurationListener {
- private static final transient Logger LOGGER = org.slf4j.LoggerFactory.getLogger(HazelcastClusterManager.class);
+ private static final transient Logger LOGGER = org.slf4j.LoggerFactory.getLogger(HazelcastGroupManager.class);
private static final String GROUPS = "org.apache.karaf.cellar.groups";
+ private static final String GROUPS_CONFIG = "org.apache.karaf.cellar.groups.config";
private static final String DEFAULT_GROUP = "default";
private Map<String, ServiceRegistration> producerRegistrations = new HashMap<String, ServiceRegistration>();
@@ -68,6 +76,9 @@ public class HazelcastGroupManager imple
private CombinedClassLoader combinedClassLoader;
public void init() {
+ //Create a listener for group configuration.
+ IMap groupConfiguration = instance.getMap(GROUPS_CONFIG);
+ groupConfiguration.addEntryListener(this,true);
//Add group to configuration
try {
Configuration configuration = configurationAdmin.getConfiguration(Configurations.NODE);
@@ -214,7 +225,7 @@ public class HazelcastGroupManager imple
if (groups != null && !groups.isEmpty()) {
for (Group group : groups.values()) {
- if (group.getMembers().contains(node)) {
+ if (group.getNodes().contains(node)) {
names.add(group.getName());
}
}
@@ -229,6 +240,7 @@ public class HazelcastGroupManager imple
String groupName = group.getName();
createGroup(groupName);
+ LOGGER.info("Registering group {}.",groupName);
Properties serviceProperties = new Properties();
serviceProperties.put("type", "group");
serviceProperties.put("name", groupName);
@@ -368,8 +380,9 @@ public class HazelcastGroupManager imple
}
/**
- * Copies the setup of a {@link Group}.
- *
+ * Copies the configuration of a {@link Group}.
+ * <b>1.</b> Updates configuration admin from Hazelcast using source config.
+ * <b>2.</b> Creates target configuration both on Hazelcast and configuration admin.
* @param sourceGroupName
* @param targetGroupName
*/
@@ -377,24 +390,37 @@ public class HazelcastGroupManager imple
try {
Configuration conf = configurationAdmin.getConfiguration(Configurations.GROUP);
if (conf != null) {
- Dictionary dictionary = conf.getProperties();
- if (dictionary != null) {
- Dictionary updatedProperties = new Properties();
- Enumeration keyEnumeration = dictionary.keys();
- while (keyEnumeration.hasMoreElements()) {
- String key = (String) keyEnumeration.nextElement();
- String value = (String) dictionary.get(key);
-
- if (key.startsWith(sourceGroupName)) {
- String newKey = key.replace(sourceGroupName, targetGroupName);
- updatedProperties.put(newKey, value);
- }
- updatedProperties.put(key, value);
- }
+
+ //Get configuration from config admin.
+ Dictionary configAdminProperties = conf.getProperties();
+ if(configAdminProperties == null) {
+ configAdminProperties = new Properties();
+ }
+ //Get configuration from Hazelcast
+ Map<String,String> sourceGropConfig = instance.getMap(GROUPS_CONFIG);
+
+ //Update local configuration from cluster.
+ for(Map.Entry<String,String> parentEntry:sourceGropConfig.entrySet()) {
+ configAdminProperties.put(parentEntry.getKey(),parentEntry.getValue());
+ }
- conf.update(updatedProperties);
+
+ Dictionary updatedProperties = new Properties();
+ Enumeration keyEnumeration = configAdminProperties.keys();
+ while (keyEnumeration.hasMoreElements()) {
+ String key = (String) keyEnumeration.nextElement();
+ String value = (String) configAdminProperties.get(key);
+
+ if (key.startsWith(sourceGroupName)) {
+ String newKey = key.replace(sourceGroupName, targetGroupName);
+ updatedProperties.put(newKey, value);
+ sourceGropConfig.put(key, value);
+ }
+ updatedProperties.put(key, value);
}
+
+ conf.update(updatedProperties);
}
} catch (IOException e) {
@@ -442,6 +468,78 @@ public class HazelcastGroupManager imple
}
+ public void configurationEvent(ConfigurationEvent configurationEvent) {
+ String pid = configurationEvent.getPid();
+ if(pid.equals(GROUPS)) {
+ LOGGER.info("Local group configuration has been updated, updating distributed group configuration");
+ Map groupConfiguration = instance.getMap(GROUPS_CONFIG);
+
+ try {
+ Configuration conf = configurationAdmin.getConfiguration(GROUPS);
+ Dictionary properties = conf.getProperties();
+ Enumeration keyEnumeration = properties.keys();
+ while (keyEnumeration.hasMoreElements()) {
+ Object key = keyEnumeration.nextElement();
+ Object value = properties.get(key);
+ if(!groupConfiguration.containsKey(key) || groupConfiguration.get(key) == null || !groupConfiguration.get(key).equals(value)) {
+ groupConfiguration.put(key,value);
+ }
+ }
+ } catch (Exception e) {
+ LOGGER.warn("Failed to update group configuration");
+ }
+ }
+ }
+
+ /**
+ * Invoked when an entry is added.
+ *
+ * @param entryEvent entry event
+ */
+ public void entryAdded(EntryEvent entryEvent) {
+ entryUpdated(entryEvent);
+ }
+
+ /**
+ * Invoked when an entry is removed.
+ *
+ * @param entryEvent entry event
+ */
+ public void entryRemoved(EntryEvent entryEvent) {
+ entryUpdated(entryEvent);
+ }
+
+ /**
+ * Invoked when an entry is updated.
+ *
+ * @param entryEvent entry event
+ */
+ public void entryUpdated(EntryEvent entryEvent) {
+ LOGGER.info("Distributed Group configuration has been updated, updating local configuration.");
+ try {
+ Configuration conf = configurationAdmin.getConfiguration(GROUPS);
+ Dictionary props = conf.getProperties();
+ Object key = entryEvent.getKey();
+ Object value = entryEvent.getValue();
+ if (props.get(key) == null || !props.get(key).equals(value)) {
+ props.put(key, value);
+ conf.update(props);
+ }
+ } catch (Exception ex) {
+ LOGGER.warn("Error while updating local group configuration", ex);
+ }
+ }
+
+ /**
+ * Invoked when an entry is evicted.
+ *
+ * @param entryEvent entry event
+ */
+ public void entryEvicted(EntryEvent entryEvent) {
+ entryUpdated(entryEvent);
+ }
+
+
public HazelcastInstance getInstance() {
return instance;
}
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1209982&r1=1209981&r2=1209982&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml Sat Dec 3 19:08:55 2011
@@ -154,11 +154,17 @@
<service ref="producer" interface="org.apache.karaf.cellar.core.event.EventProducer"/>
<service ref="clusterManager" interface="org.apache.karaf.cellar.core.ClusterManager"/>
- <service ref="groupManager" interface="org.apache.karaf.cellar.core.GroupManager"/>
<service ref="eventTransportFactory" interface="org.apache.karaf.cellar.core.event.EventTransportFactory"/>
<service ref="executionContext" interface="org.apache.karaf.cellar.core.command.ExecutionContext"/>
<service ref="commandStore" interface="org.apache.karaf.cellar.core.command.CommandStore"/>
+ <service ref="groupManager">
+ <interfaces>
+ <value>org.apache.karaf.cellar.core.GroupManager</value>
+ <value>org.osgi.service.cm.ConfigurationListener</value>
+ </interfaces>
+ </service>
+
<!-- Event Handler Service -->
<service ref="consumerSwitchCommandHandler" interface="org.apache.karaf.cellar.core.event.EventHandler"/>
<service ref="consumerSwitchResultHandler" interface="org.apache.karaf.cellar.core.event.EventHandler"/>