Skip to content
Snippets Groups Projects
Commit caf01aea authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into Version-2

# Conflicts:
#	kop-common-parent/pom.xml
parents 17394c96 5af971c3
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Image bauen # Image bauen
`docker build -t docker.ozg-sh.de/jenkins-build-agent .` `docker build -t docker.ozg-sh.de/jenkins-build-agent .`
docker.ozg-sh.de/jenkins-build-agent docker.ozg-sh.de/jenkins-build-agent
......
...@@ -12,7 +12,8 @@ RUN apt update \ ...@@ -12,7 +12,8 @@ RUN apt update \
openjdk-${OPENJDK_VERSION}-jdk \ openjdk-${OPENJDK_VERSION}-jdk \
wget \ wget \
curl \ curl \
openssh-server openssh-server \
unzip
RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HELM_VERSION} -O get-helm.sh \ RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HELM_VERSION} -O get-helm.sh \
&& chmod +x get-helm.sh \ && chmod +x get-helm.sh \
...@@ -28,6 +29,11 @@ RUN wget https://get.docker.com -O get-docker.sh \ ...@@ -28,6 +29,11 @@ RUN wget https://get.docker.com -O get-docker.sh \
RUN mkdir /run/sshd RUN mkdir /run/sshd
RUN wget https://github.com/jeremylong/DependencyCheck/releases/download/v8.2.1/dependency-check-8.2.1-release.zip -O dependency-check.zip \
&& unzip dependency-check.zip \
&& mkdir /dependency-check-data \
&& dependency-check/bin/dependency-check.sh -d /dependency-check-data --updateonly
EXPOSE 22 EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"] CMD ["/usr/sbin/sshd", "-D"]
\ No newline at end of file
...@@ -25,6 +25,7 @@ package de.itvsh.kop.common.binaryfile; ...@@ -25,6 +25,7 @@ package de.itvsh.kop.common.binaryfile;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
...@@ -87,6 +88,7 @@ public class GrpcFileUploadUtils { ...@@ -87,6 +88,7 @@ public class GrpcFileUploadUtils {
void sendNext() { void sendNext() {
if (!done.get()) { if (!done.get()) {
waitForOberver();
LOG.debug("Sending next chunk."); LOG.debug("Sending next chunk.");
sendMetaData(); sendMetaData();
long sentSize = sendNextChunk(); long sentSize = sendNextChunk();
...@@ -94,6 +96,21 @@ public class GrpcFileUploadUtils { ...@@ -94,6 +96,21 @@ public class GrpcFileUploadUtils {
} }
} }
private void waitForOberver() {
synchronized (this) {
while (Objects.isNull(requestObserver)) {
try {
LOG.debug("wait for observer");
wait(300);
} catch (InterruptedException e) {
LOG.error("Error on waiting for request Observer.", e);
Thread.currentThread().interrupt();
}
}
}
}
long sendNextChunk() { long sendNextChunk() {
byte[] contentToSend = readFromStream(); byte[] contentToSend = readFromStream();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment