From: markt Date: Mon, 29 Dec 2008 00:30:00 +0000 (+0000) Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46223 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0d8e3b789297df0781259c365daf89e1c5d1726b;p=tomcat7.0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46223 Add a simple co-ordinator provided by Robert Newson git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@729815 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java b/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java new file mode 100644 index 000000000..69fdb5cfe --- /dev/null +++ b/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java @@ -0,0 +1,117 @@ +/* + * 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 + */ +package org.apache.catalina.tribes.group.interceptors; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; + +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.catalina.tribes.ChannelException; +import org.apache.catalina.tribes.Member; +import org.apache.catalina.tribes.group.AbsoluteOrder; +import org.apache.catalina.tribes.group.ChannelInterceptorBase; + +/** + * A dinky coordinator, just uses a sorted version of the member array. + * + * @author rnewson + * + */ +public class SimpleCoordinator extends ChannelInterceptorBase { + + private Member[] view; + + private AtomicBoolean membershipChanged = new AtomicBoolean(); + + private void membershipChanged() { + membershipChanged.set(true); + } + + @Override + public void memberAdded(final Member member) { + super.memberAdded(member); + membershipChanged(); + installViewWhenStable(); + } + + @Override + public void memberDisappeared(final Member member) { + super.memberDisappeared(member); + membershipChanged(); + installViewWhenStable(); + } + + /** + * Override to receive view changes. + * + * @param view + */ + protected void viewChange(final Member[] view) { + } + + @Override + public void start(int svc) throws ChannelException { + super.start(svc); + installViewWhenStable(); + } + + private void installViewWhenStable() { + int stableCount = 0; + + while (stableCount < 10) { + if (membershipChanged.compareAndSet(true, false)) { + stableCount = 0; + } else { + stableCount++; + } + try { + MILLISECONDS.sleep(250); + } catch (final InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + + final Member[] members = getMembers(); + final Member[] view = Arrays.copyOf(members, members.length + 1); + view[members.length] = getLocalMember(false); + Arrays.sort(view, AbsoluteOrder.comp); + if (Arrays.equals(view, this.view)) { + return; + } + this.view = view; + viewChange(view); + } + + @Override + public void stop(int svc) throws ChannelException { + super.stop(svc); + } + + public Member[] getView() { + return view; + } + + public Member getCoordinator() { + return view == null ? null : view[0]; + } + + public boolean isCoordinator() { + return view == null ? false : getLocalMember(false).equals( + getCoordinator()); + } + +} diff --git a/webapps/docs/config/cluster-interceptor.xml b/webapps/docs/config/cluster-interceptor.xml index 59e299a41..b6db4a646 100644 --- a/webapps/docs/config/cluster-interceptor.xml +++ b/webapps/docs/config/cluster-interceptor.xml @@ -46,6 +46,7 @@
  • org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor
  • org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator
  • org.apache.catalina.tribes.group.interceptors.OrderInterceptor
  • +
  • org.apache.catalina.tribes.group.interceptors.SimpleCoordinator
  • org.apache.catalina.tribes.group.interceptors.StaticMembershipInterceptor
  • org.apache.catalina.tribes.group.interceptors.TwoPhaseCommitInterceptor
  • org.apache.catalina.tribes.group.interceptors.DomainFilterInterceptor