Skip to content

Commit

Permalink
Merge pull request #1624 from pveentjer/clusterservicecleanup
Browse files Browse the repository at this point in the history 
Optimized the Cluster.getMember functionality
  • Loading branch information
@noctarius
noctarius committed Jan 28, 2014
2 parents aaacde4 + 60da530 commit 17bd6a8
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 41 deletions.
73 changes: 33 additions & 40 deletions hazelcast/src/main/java/com/hazelcast/cluster/ClusterServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

import static com.hazelcast.core.LifecycleEvent.LifecycleState.MERGED;
import static com.hazelcast.core.LifecycleEvent.LifecycleState.MERGING;
import static java.util.Collections.unmodifiableMap;
import static java.util.Collections.unmodifiableSet;

public final class ClusterServiceImpl implements ClusterService, ConnectionListener, ManagedService,
Expand Down Expand Up @@ -80,7 +81,9 @@ public final class ClusterServiceImpl implements ClusterService, ConnectionListe

private final Set<MemberInfo> setJoins = new LinkedHashSet<MemberInfo>(100);

private final AtomicReference<Map<Address, MemberImpl>> membersRef = new AtomicReference<Map<Address, MemberImpl>>();
private final AtomicReference<Map<Address, MemberImpl>> membersMapRef = new AtomicReference<Map<Address, MemberImpl>>(Collections.EMPTY_MAP);

private final AtomicReference<Set<MemberImpl>> membersRef = new AtomicReference<Set<MemberImpl>>(Collections.EMPTY_SET);

private final AtomicBoolean preparingToMerge = new AtomicBoolean(false);

Expand Down Expand Up @@ -713,10 +716,8 @@ private static Collection<MemberInfo> createMemberInfos(Collection<MemberImpl> m
void updateMembers(Collection<MemberInfo> members) {
lock.lock();
try {
Map<Address, MemberImpl> oldMemberMap = membersRef.get();
if (oldMemberMap == null) {
oldMemberMap = Collections.emptyMap();
}
Map<Address, MemberImpl> oldMemberMap = membersMapRef.get();

if (oldMemberMap.size() == members.size()) {
boolean same = true;
for (MemberInfo memberInfo : members) {
Expand Down Expand Up @@ -757,16 +758,14 @@ void updateMembers(Collection<MemberInfo> members) {
public void updateMemberAttribute(String uuid, MapOperationType operationType, String key, Object value) {
lock.lock();
try {
Map<Address, MemberImpl> memberMap = membersRef.get();
if (memberMap != null) {
for (MemberImpl member : memberMap.values()) {
if (member.getUuid().equals(uuid)) {
if (!member.equals(getLocalMember())) {
member.updateAttribute(operationType, key, value);
}
sendMemberAttributeEvent(member, operationType, key, value);
break;
Map<Address, MemberImpl> memberMap = membersMapRef.get();
for (MemberImpl member : memberMap.values()) {
if (member.getUuid().equals(uuid)) {
if (!member.equals(getLocalMember())) {
member.updateAttribute(operationType, key, value);
}
sendMemberAttributeEvent(member, operationType, key, value);
break;
}
}
} finally {
Expand Down Expand Up @@ -820,10 +819,7 @@ private void setMembers(MemberImpl... members) {
}
lock.lock();
try {
Map<Address, MemberImpl> oldMemberMap = membersRef.get();
if (oldMemberMap == null) {
oldMemberMap = Collections.emptyMap();
}
Map<Address, MemberImpl> oldMemberMap = membersMapRef.get();
final Map<Address, MemberImpl> memberMap = new LinkedHashMap<Address, MemberImpl>(); // ! ORDERED !
final Collection<MemberImpl> newMembers = new LinkedList<MemberImpl>();
for (MemberImpl member : members) {
Expand Down Expand Up @@ -860,8 +856,8 @@ private void removeMember(MemberImpl deadMember) {
logger.info("Removing " + deadMember);
lock.lock();
try {
final Map<Address, MemberImpl> members = membersRef.get();
if (members != null && members.containsKey(deadMember.getAddress())) {
final Map<Address, MemberImpl> members = membersMapRef.get();
if (members.containsKey(deadMember.getAddress())) {
Map<Address, MemberImpl> newMembers = new LinkedHashMap<Address, MemberImpl>(members); // ! ORDERED !
newMembers.remove(deadMember.getAddress());
masterConfirmationTimes.remove(deadMember);
Expand Down Expand Up @@ -952,19 +948,17 @@ public MemberImpl getMember(Address address) {
if (address == null) {
return null;
}
final Map<Address, MemberImpl> memberMap = membersRef.get();
return memberMap != null ? memberMap.get(address) : null;
Map<Address, MemberImpl> memberMap = membersMapRef.get();
return memberMap.get(address);
}

@Override
public MemberImpl getMember(String uuid) {
if (uuid == null) {
return null;
}
final Map<Address, MemberImpl> memberMap = membersRef.get();
if (memberMap == null) {
return null;
}

Map<Address, MemberImpl> memberMap = membersMapRef.get();
for (MemberImpl member : memberMap.values()) {
if (uuid.equals(member.getUuid())) {
return member;
Expand All @@ -973,19 +967,24 @@ public MemberImpl getMember(String uuid) {
return null;
}

private void setMembersRef(final Map<Address, MemberImpl> memberMap) {
final Map<Address, MemberImpl> members = Collections.unmodifiableMap(memberMap);
private void setMembersRef(Map<Address, MemberImpl> memberMap) {
memberMap = unmodifiableMap(memberMap);
// make values(), keySet() and entrySet() to be cached
members.values();
members.keySet();
members.entrySet();
membersRef.set(members);
memberMap.values();
memberMap.keySet();
memberMap.entrySet();
membersMapRef.set(memberMap);
membersRef.set(unmodifiableSet(new LinkedHashSet<MemberImpl>(memberMap.values())));
}

@Override
public Collection<MemberImpl> getMemberList() {
final Map<Address, MemberImpl> map = membersRef.get();
return map != null ? Collections.unmodifiableCollection(map.values()) : Collections.<MemberImpl>emptySet();
return membersRef.get();
}

@Override
public Set<Member> getMembers() {
return (Set)membersRef.get();
}

@Override
Expand All @@ -1012,12 +1011,6 @@ public Member getLocalMember() {
return node.getLocalMember();
}

@Override
public Set<Member> getMembers() {
final Collection<MemberImpl> members = getMemberList();
return members != null ? new LinkedHashSet<Member>(members) : new HashSet<Member>(0);
}

@Override
public int getSize() {
final Collection<MemberImpl> members = getMemberList();
Expand Down
2 changes: 1 addition & 1 deletion hazelcast/src/main/java/com/hazelcast/instance/NodeShutdownLatch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ final class NodeShutdownLatch {
localMember = node.localMember;
Collection<MemberImpl> memberList = node.clusterService.getMemberList();
registrations = new HashMap<String, HazelcastInstanceImpl>(3);
Set<MemberImpl> members = memberList instanceof Set ? (Set<MemberImpl>) memberList : new HashSet<MemberImpl>(memberList);
Set<MemberImpl> members = new HashSet<MemberImpl>(memberList);
members.remove(localMember);

if (!members.isEmpty()) {
Expand Down

0 comments on commit 17bd6a8

Please sign in to comment.