brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [3/4] incubator-brooklyn git commit: SshFeed: if same cmd, then share result
Date Tue, 26 Jan 2016 20:10:49 GMT
SshFeed: if same cmd, then share result

- Fix the avoidance of executing the same command repeatedly, if an
  SshFeed is configured with multiple sensors that use the output
  of the same command.

Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/30700550
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/30700550
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/30700550

Branch: refs/heads/master
Commit: 3070055048e4cd6cd2544461bf7a42aa9884732d
Parents: 7f302ca
Author: Aled Sage <aled.sage@gmail.com>
Authored: Mon Jan 25 17:35:11 2016 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Mon Jan 25 17:35:11 2016 +0000

----------------------------------------------------------------------
 .../apache/brooklyn/feed/ssh/SshPollConfig.java |  56 +++++-
 .../apache/brooklyn/feed/ssh/SshFeedTest.java   | 188 +++++++++++++++++++
 2 files changed, 240 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/30700550/brooklyn-server/core/src/main/java/org/apache/brooklyn/feed/ssh/SshPollConfig.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/core/src/main/java/org/apache/brooklyn/feed/ssh/SshPollConfig.java
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/feed/ssh/SshPollConfig.java
index 8fec87f..7839fde 100644
--- a/brooklyn-server/core/src/main/java/org/apache/brooklyn/feed/ssh/SshPollConfig.java
+++ b/brooklyn-server/core/src/main/java/org/apache/brooklyn/feed/ssh/SshPollConfig.java
@@ -18,6 +18,8 @@
  */
 package org.apache.brooklyn.feed.ssh;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +31,7 @@ import org.apache.brooklyn.core.feed.PollConfig;
 import org.apache.brooklyn.util.collections.MutableList;
 import org.apache.brooklyn.util.collections.MutableMap;
 
+import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
@@ -67,7 +70,12 @@ public class SshPollConfig<T> extends PollConfig<SshPollValue,
T, SshPollConfig<
     public Map<String, String> getEnv() {
         return getEnvSupplier().get();
     }
+    
+    @SuppressWarnings("unused")
     public Supplier<Map<String,String>> getEnvSupplier() {
+        if (true) return new CombiningEnvSupplier(dynamicEnvironmentSupplier);
+        
+        // TODO Kept in case it's persisted; new code will not use this.
         return new Supplier<Map<String,String>>() {
             @Override
             public Map<String, String> get() {
@@ -82,13 +90,53 @@ public class SshPollConfig<T> extends PollConfig<SshPollValue,
T, SshPollConfig<
                 }
                 return result;
             }
+            private void mergeEnvMaps(Map<String,String> supplied, Map<String,String>
target) {
+                if (supplied==null) return;
+                // as the value is a string there is no need to look at deep merge behaviour
+                target.putAll(supplied);
+            }
         };
     }
     
-    protected void mergeEnvMaps(Map<String,String> supplied, Map<String,String>
target) {
-        if (supplied==null) return;
-        // as the value is a string there is no need to look at deep merge behaviour
-        target.putAll(supplied);
+    private static class CombiningEnvSupplier implements Supplier<Map<String,String>>
{
+        private final List<Supplier<Map<String, String>>> dynamicEnvironmentSupplier;
+        
+        public CombiningEnvSupplier(List<Supplier<Map<String,String>>>
dynamicEnvironmentSupplier) {
+            this.dynamicEnvironmentSupplier = checkNotNull(dynamicEnvironmentSupplier, "dynamicEnvironmentSupplier");
+        }
+        @Override
+        public Map<String, String> get() {
+            Map<String,String> result = MutableMap.of();
+            for (Supplier<Map<String, String>> envS: dynamicEnvironmentSupplier)
{
+                if (envS!=null) {
+                    Map<String, String> envM = envS.get();
+                    if (envM!=null) {
+                        mergeEnvMaps(envM, result);
+                    }
+                }
+            }
+            return result;
+        }
+        protected void mergeEnvMaps(Map<String,String> supplied, Map<String,String>
target) {
+            if (supplied==null) return;
+            // as the value is a string there is no need to look at deep merge behaviour
+            target.putAll(supplied);
+        }
+        @Override
+        public int hashCode() {
+            return dynamicEnvironmentSupplier.hashCode();
+        }
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof CombiningEnvSupplier)) return false;
+            CombiningEnvSupplier o = (CombiningEnvSupplier) obj;
+            
+            return Objects.equal(dynamicEnvironmentSupplier, o.dynamicEnvironmentSupplier);
+        }
+        @Override
+        public String toString() {
+            return "CombiningEnvSupplier("+dynamicEnvironmentSupplier+")";
+        }
     }
 
     public SshPollConfig<T> command(String val) { return command(Suppliers.ofInstance(val));
}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/30700550/brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java
b/brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java
new file mode 100644
index 0000000..a3f22dd
--- /dev/null
+++ b/brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java
@@ -0,0 +1,188 @@
+/*
+ * 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.feed.ssh;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.brooklyn.api.entity.EntityLocal;
+import org.apache.brooklyn.api.entity.EntitySpec;
+import org.apache.brooklyn.api.location.LocationSpec;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
+import org.apache.brooklyn.core.sensor.Sensors;
+import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
+import org.apache.brooklyn.core.test.entity.TestEntity;
+import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation;
+import org.apache.brooklyn.location.ssh.SshMachineLocation;
+import org.apache.brooklyn.test.Asserts;
+import org.apache.brooklyn.util.stream.Streams;
+import org.apache.brooklyn.util.time.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Functions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+
+public class SshFeedTest extends BrooklynAppUnitTestSupport {
+
+    private static final Logger log = LoggerFactory.getLogger(SshFeedTest.class);
+    
+    final static AttributeSensor<String> SENSOR_STRING = Sensors.newStringSensor("aString",
"");
+    final static AttributeSensor<String> SENSOR_STRING2 = Sensors.newStringSensor("aString2",
"");
+
+    private LocalhostMachineProvisioningLocation loc;
+    private EntityLocal entity;
+    private SshFeed feed;
+    
+    @BeforeMethod(alwaysRun=true)
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        loc = app.newLocalhostProvisioningLocation();
+        entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
+        RecordingSshMachineLocation.execScriptCalls.clear();
+    }
+
+    @AfterMethod(alwaysRun=true)
+    @Override
+    public void tearDown() throws Exception {
+        if (feed != null) feed.stop();
+        super.tearDown();
+        if (loc != null) Streams.closeQuietly(loc);
+        RecordingSshMachineLocation.execScriptCalls.clear();
+    }
+    
+    @Test(groups="Integration") // integration because slow 
+    public void testSharesCallWhenSameCommand() throws Exception {
+        final RecordingSshMachineLocation recordingMachine = mgmt.getLocationManager().createLocation(LocationSpec.create(RecordingSshMachineLocation.class));
+        app.start(ImmutableList.of(recordingMachine));
+        
+        final String cmd = "myCommand";
+        
+        feed = SshFeed.builder()
+                .period(Duration.PRACTICALLY_FOREVER)
+                .entity(entity)
+                .poll(new SshPollConfig<String>(SENSOR_STRING)
+                        .env(ImmutableMap.of("mykey", "myval"))
+                        .command(cmd)
+                        .onSuccess(Functions.constant("success")))
+                .poll(new SshPollConfig<String>(SENSOR_STRING2)
+                        .env(ImmutableMap.of("mykey", "myval"))
+                        .command(cmd)
+                        .onSuccess(Functions.constant("success2")))
+                .build();
+        
+        // Expect it to only execute once (i.e. share exec result for both sensors).
+        // Wait several seconds, in case it takes a while to do the second exec.
+        Asserts.succeedsEventually(new Runnable() {
+            public void run() {
+                assertEquals(RecordingSshMachineLocation.execScriptCalls, ImmutableList.of(ImmutableList.of(cmd)));
+            }});
+        Asserts.succeedsContinually(ImmutableMap.of("timeout", Duration.FIVE_SECONDS), new
Runnable() {
+            public void run() {
+                assertEquals(RecordingSshMachineLocation.execScriptCalls, ImmutableList.of(ImmutableList.of(cmd)));
+            }});
+    }
+
+    @Test
+    public void testDifferentCallsWhenDifferentCommands() throws Exception {
+        final RecordingSshMachineLocation recordingMachine = mgmt.getLocationManager().createLocation(LocationSpec.create(RecordingSshMachineLocation.class));
+        app.start(ImmutableList.of(recordingMachine));
+        
+        final String cmd = "myCommand";
+        final String cmd2 = "myCommand2";
+        
+        feed = SshFeed.builder()
+                .period(Duration.PRACTICALLY_FOREVER)
+                .entity(entity)
+                .poll(new SshPollConfig<String>(SENSOR_STRING)
+                        .command(cmd)
+                        .onSuccess(Functions.constant("success")))
+                .poll(new SshPollConfig<String>(SENSOR_STRING2)
+                        .command(cmd2)
+                        .onSuccess(Functions.constant("success")))
+                .build();
+        
+        // Expect it to execute the different commands (i.e. not share)
+        Asserts.succeedsEventually(new Runnable() {
+            public void run() {
+                assertEquals(ImmutableSet.copyOf(RecordingSshMachineLocation.execScriptCalls),
ImmutableSet.of(ImmutableList.of(cmd), ImmutableList.of(cmd2)));
+            }});
+    }
+
+    @Test
+    public void testDifferentCallsWhenDifferentEnv() throws Exception {
+        final RecordingSshMachineLocation recordingMachine = mgmt.getLocationManager().createLocation(LocationSpec.create(RecordingSshMachineLocation.class));
+        app.start(ImmutableList.of(recordingMachine));
+        
+        final String cmd = "myCommand";
+        
+        feed = SshFeed.builder()
+                .period(Duration.PRACTICALLY_FOREVER)
+                .entity(entity)
+                .poll(new SshPollConfig<String>(SENSOR_STRING)
+                        .env(ImmutableMap.of("mykey", "myval"))
+                        .command(cmd)
+                        .onSuccess(Functions.constant("success")))
+                .poll(new SshPollConfig<String>(SENSOR_STRING2)
+                        .env(ImmutableMap.of("mykey", "myval2"))
+                        .command(cmd)
+                        .onSuccess(Functions.constant("success")))
+                .build();
+        
+        // Expect it to execute the command twice, with different envs (i.e. not share)
+        Asserts.succeedsEventually(new Runnable() {
+            public void run() {
+                assertEquals(RecordingSshMachineLocation.execScriptCalls, ImmutableList.of(ImmutableList.of(cmd),
ImmutableList.of(cmd)));
+            }});
+    }
+
+    public static class RecordingSshMachineLocation extends SshMachineLocation {
+        public static List<List<String>> execScriptCalls = Lists.newCopyOnWriteArrayList();
+
+        @Override 
+        public int execScript(String summary, List<String> cmds) {
+            execScriptCalls.add(cmds);
+            return 0;
+        }
+        @Override 
+        public int execScript(Map<String,?> props, String summaryForLogging, List<String>
cmds) {
+            execScriptCalls.add(cmds);
+            return 0;
+        }
+        @Override 
+        public int execScript(String summaryForLogging, List<String> cmds, Map<String,?>
env) {
+            execScriptCalls.add(cmds);
+            return 0;
+        }
+        @Override 
+        public int execScript(Map<String,?> props, String summaryForLogging, List<String>
cmds, Map<String,?> env) {
+            execScriptCalls.add(cmds);
+            return 0;
+        }
+    }
+}


Mime
View raw message