Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Epankou/bug strace get pid ewc 421 #176

Merged
merged 12 commits into from
Dec 29, 2018
Merged

Epankou/bug strace get pid ewc 421 #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ac8b475
Bug(fix) microservice removal: networking microsrevice isn't removed …
epankou Dec 20, 2018
f3b3276
Bug(fix) microservice removal: removed extra host mapping (EWC-424)
epankou Dec 20, 2018
1c2ee60
Bug(fix) microservice removal: simplified getRunningContainers method…
epankou Dec 20, 2018
bcb1e3a
Merge remote-tracking branch 'origin/develop' into epankou/bug-micros…
epankou Dec 26, 2018
3903b39
Bug(fix) route update: added missing method for route update (EWC-374)
epankou Dec 27, 2018
344e069
Bug(fix) mic removal update: added synchronization (EWC-374)
epankou Dec 28, 2018
92fc462
Bug(fix) mic removal update: added synchronization (EWC-374)
epankou Dec 28, 2018
8268143
Bug(fix) mic removal update: added synchronization (EWC-374)
epankou Dec 28, 2018
7390c44
Bug(fix) mic removal update: added synchronization (EWC-374)
epankou Dec 29, 2018
4dce9c6
Bug(fix) strace: fixed method getpid (EWC-421)
epankou Dec 29, 2018
35338da
Bug(fix) strace: fixed method getpid (EWC-421)
epankou Dec 29, 2018
09ece4e
Bug(fix) strace: fixed method getpid (EWC-421)
epankou Dec 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions daemon/src/org/eclipse/iofog/diagnostics/strace/StraceDiagnosticManger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@

import org.eclipse.iofog.command_line.util.CommandShellExecutor;
import org.eclipse.iofog.command_line.util.CommandShellResultSet;
import org.eclipse.iofog.process_manager.DockerUtil;
import org.eclipse.iofog.utils.logging.LoggingService;

import javax.json.*;
import javax.json.JsonArray;
import javax.json.JsonObject;
import javax.json.JsonValue;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CopyOnWriteArrayList;
Expand Down Expand Up @@ -81,7 +84,7 @@ private Optional<MicroserviceStraceData> getStraceDataByMicroserviceUuid(String

public void enableMicroserviceStraceDiagnostics(String microserviceUuid) {
try {
int pid = getPidByMicroserviceUuid(microserviceUuid);
int pid = getPidByMicroserviceUuid(DockerUtil.getContainerName(microserviceUuid));
MicroserviceStraceData newMicroserviceStraceData = new MicroserviceStraceData(microserviceUuid, pid, true);
this.monitoringMicroservices.removeIf(
oldMicroserviceStraceData -> oldMicroserviceStraceData.getMicroserviceUuid().equals(microserviceUuid)
Expand Down
20 changes: 14 additions & 6 deletions daemon/src/org/eclipse/iofog/process_manager/DockerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,24 @@ public String getContainerName(Container container) {
return container.getNames()[0].substring(1);
}

/**
* gets microsreviceUuid (basically just gets substring of container name)
* @param container Container object
* @return microsreviceUuid
*/
public String getContainerMicroserviceUuid(Container container) {
return getContainerName(container).substring(Constants.IOFOG_DOCKER_CONTAINER_NAME_PREFIX.length());
}

/**
* gets container name by microserviceUuid
* @param microserviceUuid
* @return container name
*/
public static String getContainerName(String microserviceUuid) {
return Constants.IOFOG_DOCKER_CONTAINER_NAME_PREFIX + microserviceUuid;
}

/**
* returns a {@link Container} if exists
*
Expand Down Expand Up @@ -280,12 +294,6 @@ public List<Container> getRunningIofogContainers() {
.collect(Collectors.toList());
}

public List<Container> getRunningNonIofogContainers() {
return getRunningContainers().stream()
.filter(container -> !getContainerName(container).startsWith(Constants.IOFOG_DOCKER_CONTAINER_NAME_PREFIX))
.collect(Collectors.toList());
}

public Optional<Statistics> getContainerStats(String containerId) {
StatsCmd statsCmd = dockerClient.statsCmd(containerId);
CountDownLatch countDownLatch = new CountDownLatch(1);
Expand Down
3 changes: 1 addition & 2 deletions daemon/src/org/eclipse/iofog/process_manager/ProcessManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.eclipse.iofog.microservice.MicroserviceState;
import org.eclipse.iofog.microservice.MicroserviceStatus;
import org.eclipse.iofog.status_reporter.StatusReporter;
import org.eclipse.iofog.utils.Constants;
import org.eclipse.iofog.utils.Constants.ModulesStatus;
import org.eclipse.iofog.utils.configuration.Configuration;

Expand Down Expand Up @@ -202,7 +201,7 @@ private void deleteRemainingMicroservices() {
oldAgentMicroserviceUuids.add(uuid);
} else if (!isCurrentMicroserviceUuid
&& !isLatestMicroserviceUuid
&& runningContainerNames.contains(Constants.IOFOG_DOCKER_CONTAINER_NAME_PREFIX + uuid)) {
&& runningContainerNames.contains(DockerUtil.getContainerName(uuid))) {
unknownMicroserviceUuids.add(uuid);
} else if (!isCurrentMicroserviceUuid
&& !isLatestMicroserviceUuid
Expand Down