zenon/distributed-systems-technologies
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix weird NotModifiedException bug (3.2.3)

Browse Source
This commit is contained in:
Tobias Eidelpes 2021-05-18 23:01:06 +02:00
parent ffbd44826b
commit ae25560fb5
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ass3-elastic/src/main/java/dst/ass3/elastic/impl/ContainerService.java
View File

@ -1,6 +1,7 @@
package dst.ass3.elastic.impl; package dst.ass3.elastic.impl;
import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.exception.NotModifiedException;
import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.DockerClientBuilder;
import dst.ass3.elastic.ContainerException; import dst.ass3.elastic.ContainerException;
import dst.ass3.elastic.ContainerInfo; import dst.ass3.elastic.ContainerInfo;
@ -26,15 +27,21 @@ public class ContainerService implements IContainerService {
@Override @Override
public void stopContainer(String containerId) throws ContainerException { public void stopContainer(String containerId) throws ContainerException {
containers.forEach(containerInfo -> { boolean found = false;
if (containerInfo.getContainerId().equals(containerId)) { for (ContainerInfo info : containers) {
containers.remove(containerInfo); if (info.getContainerId().equals(containerId)) {
dockerClient.stopContainerCmd(containerId).exec(); containers.remove(info);
dockerClient.removeContainerCmd(containerId).exec(); found = true;
return; break;
} }
}); }
if (!found)
throw new ContainerNotFoundException("Container with id " + containerId + " not found"); throw new ContainerNotFoundException("Container with id " + containerId + " not found");
try {
dockerClient.stopContainerCmd(containerId).exec();
} catch (NotModifiedException ignored) {
}
} }
@Override @Override

3
ass3-elastic/src/main/java/dst/ass3/elastic/impl/ElasticityFactory.java
View File

@ -10,8 +10,7 @@ public class ElasticityFactory implements IElasticityFactory {
@Override @Override
public IContainerService createContainerService() { public IContainerService createContainerService() {
// TODO return new ContainerService();
return null;
} }
@Override @Override