diff options
Diffstat (limited to 'engine-d')
3 files changed, 95 insertions, 2 deletions
diff --git a/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java index 6808e98..78f2677 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java @@ -33,6 +33,7 @@ import org.kie.api.runtime.rule.FactHandle; import org.onap.holmes.common.api.entity.AlarmInfo; import org.onap.holmes.common.api.entity.CorrelationRule; import org.onap.holmes.common.api.stat.VesAlarm; +import org.onap.holmes.common.config.MicroServiceConfig; import org.onap.holmes.common.dmaap.store.ClosedLoopControlNameCache; import org.onap.holmes.common.exception.AlarmInfoException; import org.onap.holmes.common.exception.CorrelationException; @@ -65,6 +66,7 @@ public class DroolsEngine { private ReleaseId compilationRelease = ks.newReleaseId("org.onap.holmes", "compilation", "1.0.0-SNAPSHOT"); private KieContainer container; private KieSession session; + private String instanceIp; @Inject public void setRuleMgtWrapper(RuleMgtWrapper ruleMgtWrapper) { @@ -100,6 +102,7 @@ public class DroolsEngine { log.error("Failed to startup the engine of Holmes: " + e.getMessage(), e); throw ExceptionUtil.buildExceptionResponse("Failed to startup Drools!"); } + instanceIp = MicroServiceConfig.getMicroServiceIpAndPort()[0]; } public void stop() { @@ -123,7 +126,11 @@ public class DroolsEngine { } private void initRules() throws CorrelationException { - List<CorrelationRule> rules = ruleMgtWrapper.queryRuleByEnable(ENABLE); + List<CorrelationRule> rules = ruleMgtWrapper.queryRuleByEnable(ENABLE) + .stream() + .filter(r -> r.getEngineInstance().equals(instanceIp)) + .collect(Collectors.toList()); + if (rules.isEmpty()) { return; } diff --git a/engine-d/src/main/java/org/onap/holmes/engine/manager/status/EntityStatusRefreshTask.java b/engine-d/src/main/java/org/onap/holmes/engine/manager/status/EntityStatusRefreshTask.java new file mode 100644 index 0000000..0b15999 --- /dev/null +++ b/engine-d/src/main/java/org/onap/holmes/engine/manager/status/EntityStatusRefreshTask.java @@ -0,0 +1,82 @@ +/** + * Copyright 2020 ZTE Corporation. + * <p> + * Licensed 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.onap.holmes.engine.manager.status; + +import org.jvnet.hk2.annotations.Service; +import org.onap.holmes.common.config.MicroServiceConfig; +import org.onap.holmes.common.engine.entity.EngineEntity; +import org.onap.holmes.common.engine.service.EngineEntityService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import java.util.Optional; +import java.util.Timer; +import java.util.TimerTask; + +import static java.util.concurrent.TimeUnit.SECONDS; + +@Service +public class EntityStatusRefreshTask extends TimerTask { + private static final Logger logger = LoggerFactory.getLogger(EntityStatusRefreshTask.class); + private final long INTERVAL = SECONDS.toMillis(15); + private EngineEntity engineEntity; + private Timer timer = new Timer("EntityStatusRefreshTimer", true); + private EngineEntityService engineEntityService; + + @Inject + public EntityStatusRefreshTask(EngineEntityService engineEntityService) { + this.engineEntityService = engineEntityService; + } + + @PostConstruct + private void initialize() { + String[] serviceAddrInfo = MicroServiceConfig.getMicroServiceIpAndPort(); + if (null != serviceAddrInfo) { + String ip = serviceAddrInfo[0]; + String port = Optional.ofNullable(serviceAddrInfo[1]).orElse("9201"); + port = port.equals("80") ? "9201" : port; + engineEntity = new EngineEntity(ip, Integer.parseInt(port)); + + timer.schedule(this, SECONDS.toMillis(1), INTERVAL); + } else { + logger.warn("Failed to get the address info of current engine. " + + "Problems will be caused when it comes to a multi-instance scenario!"); + } + } + + @Override + public void run() { + if (engineEntity == null) { + logger.warn("No engine entity is specified. The status refresh task will return immediately."); + return; + } + + engineEntity.setLastModified(System.currentTimeMillis()); + + try { + if (engineEntityService.getEntity(engineEntity.getId()) == null) { + engineEntityService.insertEntity(engineEntity); + } else { + engineEntityService.updateEntity(engineEntity); + } + } catch (Exception e) { + logger.warn("Failed to update engine instance information.", e); + } + } +} diff --git a/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java b/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java index f7b7fbd..cb28faa 100644 --- a/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java @@ -1,5 +1,5 @@ /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2020 ZTE Corporation.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.junit.rules.ExpectedException; import org.onap.holmes.common.api.entity.AlarmInfo;
import org.onap.holmes.common.api.entity.CorrelationRule;
import org.onap.holmes.common.api.stat.VesAlarm;
+import org.onap.holmes.common.config.MicroServiceConfig;
import org.onap.holmes.common.dmaap.store.ClosedLoopControlNameCache;
import org.onap.holmes.common.exception.CorrelationException;
import org.onap.holmes.common.utils.DbDaoUtil;
@@ -55,6 +56,7 @@ public class DroolsEngineTest { private ClosedLoopControlNameCache closedLoopControlNameCache;
public DroolsEngineTest() throws Exception {
+ System.setProperty(MicroServiceConfig.HOSTNAME, "127.0.0.1:80");
droolsEngine = new DroolsEngine();
ruleMgtWrapper = new RuleMgtWrapperStub();
dbDaoUtilStub = new DbDaoUtilStub();
@@ -64,6 +66,7 @@ public class DroolsEngineTest { droolsEngine.setRuleMgtWrapper(ruleMgtWrapper);
Whitebox.invokeMethod(droolsEngine, "init");
+ System.clearProperty(MicroServiceConfig.HOSTNAME);
}
@Before
@@ -250,6 +253,7 @@ class RuleMgtWrapperStub extends RuleMgtWrapper { rule.setContent("package org.onap.holmes;");
rule.setPackageName("UT");
rule.setClosedControlLoopName(UUID.randomUUID().toString());
+ rule.setEngineInstance("127.0.0.1");
rules.add(rule);
}
|