Github user aledsage commented on a diff in the pull request:

    https://github.com/apache/brooklyn-server/pull/879#discussion_r149328337
  
    --- Diff: 
policy/src/main/java/org/apache/brooklyn/policy/ha/PropagatePrimaryEnricher.java
 ---
    @@ -0,0 +1,204 @@
    +/*
    + * 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 limitations
    + * under the License.
    + */
    +package org.apache.brooklyn.policy.ha;
    +
    +import java.util.Collection;
    +import java.util.Map;
    +import java.util.Set;
    +
    +import org.apache.brooklyn.api.effector.Effector;
    +import org.apache.brooklyn.api.entity.Entity;
    +import org.apache.brooklyn.api.mgmt.TaskAdaptable;
    +import org.apache.brooklyn.api.sensor.AttributeSensor;
    +import org.apache.brooklyn.api.sensor.EnricherSpec;
    +import org.apache.brooklyn.api.sensor.Sensor;
    +import org.apache.brooklyn.api.sensor.SensorEvent;
    +import org.apache.brooklyn.api.sensor.SensorEventListener;
    +import org.apache.brooklyn.config.ConfigKey;
    +import org.apache.brooklyn.core.config.ConfigKeys;
    +import org.apache.brooklyn.core.effector.Effectors;
    +import org.apache.brooklyn.core.effector.EffectorTasks.EffectorTaskFactory;
    +import org.apache.brooklyn.core.enricher.AbstractEnricher;
    +import org.apache.brooklyn.core.entity.EntityInternal;
    +import 
org.apache.brooklyn.core.entity.EntityInternal.SensorSupportInternal;
    +import org.apache.brooklyn.core.sensor.Sensors;
    +import org.apache.brooklyn.enricher.stock.Propagator;
    +import org.apache.brooklyn.util.collections.MutableSet;
    +import org.apache.brooklyn.util.core.config.ConfigBag;
    +import org.apache.brooklyn.util.core.task.DynamicTasks;
    +import org.slf4j.Logger;
    +import org.slf4j.LoggerFactory;
    +
    +import com.google.common.base.Objects;
    +
    +/** Makes all sensors/effectors available on primary mirrored at this node,
    + * apart from those already present here. */ 
    +@SuppressWarnings("rawtypes")
    +public class PropagatePrimaryEnricher extends AbstractEnricher implements 
SensorEventListener {
    +
    +    private static final Logger log = 
LoggerFactory.getLogger(PropagatePrimaryEnricher.class);
    +    
    +    public static final ConfigKey<String> PRIMARY_SENSOR_NAME = 
ElectPrimaryConfig.PRIMARY_SENSOR_NAME;
    +    
    +    public static final ConfigKey<Boolean> PROPAGATE_EFFECTORS = 
ConfigKeys.newBooleanConfigKey("propagate.effectors",
    +        "Whether to propagate effectors, default true (effectors already 
defined here will not be propagated)",
    +        true);
    +
    +    public static final ConfigKey<Boolean> PROPAGATING_ALL = 
Propagator.PROPAGATING_ALL;
    +    public static final ConfigKey<Collection<? extends Sensor<?>>> 
PROPAGATING_ALL_BUT = Propagator.PROPAGATING_ALL_BUT;
    +    public static final ConfigKey<Collection<? extends Sensor<?>>> 
PROPAGATING = Propagator.PROPAGATING;
    +    public static final ConfigKey<Map<? extends Sensor<?>, ? extends 
Sensor<?>>> SENSOR_MAPPING = Propagator.SENSOR_MAPPING;
    +    
    +    Entity lastPrimary;
    +    Propagator propagator;
    +    
    +    Set<String> effectorsAddedForPrimary;
    +    Set<String> blacklistedEffectors = MutableSet.of("start", "stop", 
"restart", "promote", "demote",
    +        getConfig(ElectPrimaryConfig.PROMOTE_EFFECTOR_NAME), 
getConfig(ElectPrimaryConfig.DEMOTE_EFFECTOR_NAME));
    +    Set<String> blacklistedSensors = MutableSet.of();
    +    
    +    @SuppressWarnings("unchecked")
    +    public void setEntity(@SuppressWarnings("deprecation") 
org.apache.brooklyn.api.entity.EntityLocal entity) {
    +        super.setEntity(entity);
    +        
    +        
blacklistedEffectors.addAll(((EntityInternal)entity).getMutableEntityType().getEffectors().keySet());
    +        
blacklistedSensors.addAll(((EntityInternal)entity).getMutableEntityType().getSensors().keySet());
    --- End diff --
    
    Same for this: after rebind, when it calls `setEntity`, we'll add to 
`blacklistedSensors` all the entity's sensors which will include the sensors 
that have been propagated from the existing primary.


---

Reply via email to