This is an automated email from the ASF dual-hosted git repository. wiener pushed a commit to branch edge-extensions in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 95df60262865b717a45cd11193777c4896cfccab Author: Patrick Wiener <[email protected]> AuthorDate: Fri May 21 14:14:35 2021 +0200 fixed wrong offloading policy for default strategy --- build-docker.sh => docker-build.sh | 31 +++++++++++++++++++--- streampipes-node-controller/pom.xml | 2 +- .../offloading/OffloadingPolicyManager.java | 10 ++++--- .../strategies/OffloadingStrategyFactory.java | 2 +- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/build-docker.sh b/docker-build.sh similarity index 62% rename from build-docker.sh rename to docker-build.sh index 41ba9fd..6ee84b3 100755 --- a/build-docker.sh +++ b/docker-build.sh @@ -19,13 +19,36 @@ repo=apachestreampipes version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) -docker_build(){ +docker_build_amd(){ + echo "Docker build for amd ..." docker build --no-cache --pull \ -t $repo/$1:$version \ -f $2/Dockerfile $2 } +docker_build_arm(){ + echo "Docker build for arm ..." + docker buildx build \ + --platform linux/arm/v7 \ + -t $repo/$1:$version-armv7 \ + -f $2/aarch64.Dockerfile $2 --load +} + +docker_build_aarch64(){ + echo "Docker build for aarch64 ..." + docker buildx build \ + --platform linux/arm64 \ + -t $repo/$1:$version-aarch64 \ + -f $2/aarch64.Dockerfile $2 --load +} + +docker_build_multiarch(){ + docker_build_amd $1 $2 + docker_build_arm $1 $2 + docker_build_aarch64 $1 $2 +} + echo "Start Docker builds ..." -docker_build backend streampipes-backend -docker_build node-controller streampipes-node-controller -docker_build ui ui \ No newline at end of file +docker_build_amd backend streampipes-backend +docker_build_amd ui ui +docker_build_multiarch node-controller streampipes-node-controller \ No newline at end of file diff --git a/streampipes-node-controller/pom.xml b/streampipes-node-controller/pom.xml index 53aa908..04c7a92 100644 --- a/streampipes-node-controller/pom.xml +++ b/streampipes-node-controller/pom.xml @@ -118,7 +118,7 @@ <dependency> <groupId>com.github.oshi</groupId> <artifactId>oshi-core</artifactId> - <version>5.3.6</version> + <version>5.7.3</version> </dependency> <dependency> <groupId>org.eclipse.paho</groupId> diff --git a/streampipes-node-controller/src/main/java/org/apache/streampipes/node/controller/management/offloading/OffloadingPolicyManager.java b/streampipes-node-controller/src/main/java/org/apache/streampipes/node/controller/management/offloading/OffloadingPolicyManager.java index 372c470..c9c51e1 100644 --- a/streampipes-node-controller/src/main/java/org/apache/streampipes/node/controller/management/offloading/OffloadingPolicyManager.java +++ b/streampipes-node-controller/src/main/java/org/apache/streampipes/node/controller/management/offloading/OffloadingPolicyManager.java @@ -73,12 +73,14 @@ public class OffloadingPolicyManager { InvocableStreamPipesEntity offloadEntity = strategy.getSelectionStrategy().select(this.unsuccessfullyTriedEntities); if(offloadEntity != null){ Response resp = PipelineElementManager.getInstance().offload(offloadEntity); + + String appId = offloadEntity.getAppId(); + String pipelineName = offloadEntity.getCorrespondingPipeline(); + if(resp.isSuccess()){ - LOG.info("Successfully offloaded: " + offloadEntity.getAppId() - + " of pipeline: " + offloadEntity.getCorrespondingPipeline()); + LOG.info("Successfully offloaded: {} of pipeline: {}", appId, pipelineName); } else{ - LOG.info("Failed to offload: " + offloadEntity.getAppId() - + " of pipeline: " + offloadEntity.getCorrespondingPipeline()); + LOG.warn("Failed to offload: {} of pipeline: {}", appId, pipelineName); unsuccessfullyTriedEntities.add(offloadEntity); } } else LOG.info("No pipeline element found to offload"); diff --git a/streampipes-node-controller/src/main/java/org/apache/streampipes/node/controller/management/offloading/strategies/OffloadingStrategyFactory.java b/streampipes-node-controller/src/main/java/org/apache/streampipes/node/controller/management/offloading/strategies/OffloadingStrategyFactory.java index 4def3fc..97f7244 100644 --- a/streampipes-node-controller/src/main/java/org/apache/streampipes/node/controller/management/offloading/strategies/OffloadingStrategyFactory.java +++ b/streampipes-node-controller/src/main/java/org/apache/streampipes/node/controller/management/offloading/strategies/OffloadingStrategyFactory.java @@ -84,7 +84,7 @@ public class OffloadingStrategyFactory { return new OffloadingStrategy<>( new ThresholdViolationOffloadingPolicy<>(5, Comparator.SMALLER, threshold, 4), - new FreeMemoryResourceProperty(), new RandomSelectionStrategy()); + new FreeDiskSpaceResourceProperty(), new RandomSelectionStrategy()); } }
