seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use a custom requestbody impl when resending the data to k8s (#18893) 

* Fixes #18862. Don't use a custom requestbody impl when resending the data
to k8s. OkHTTP apparently needs to read the data multiple times making
our inputstream approach not work. Instead, just use a byte array with
the body of the request.

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>
7.26.x
Lukas Krejci 2021-02-01 16:18:23 +01:00 committed by GitHub
parent 924ab944c3
commit fc5a22294b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/DirectKubernetesAPIAccessHelper.java
View File

@ -11,6 +11,7 @@
*/
package org.eclipse.che.workspace.infrastructure.kubernetes;
import com.google.common.io.ByteStreams;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@ -29,11 +30,13 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.ResponseBody;
import okio.BufferedSink;
import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
import org.eclipse.che.commons.annotation.Nullable;
public class DirectKubernetesAPIAccessHelper {
// four megabytes is hopefully gonna be fine even for the most monstrous YAML files ;)
private static final int MAX_BODY_SIZE = 4 * 1024 * 1024;
private static final String DEFAULT_MEDIA_TYPE =
javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE
.withCharset(StandardCharsets.UTF_8.name())
@ -87,8 +90,14 @@ public class DirectKubernetesAPIAccessHelper {
throws IOException {
String mediaType = inputMediaType(headers);
// ByteStreams is stable in the newer versions of Guava
@SuppressWarnings("UnstableApiUsage")
RequestBody requestBody =
body == null ? null : new InputStreamBasedRequestBody(body, mediaType);
body == null
? null
: RequestBody.create(
MediaType.parse(mediaType),
ByteStreams.toByteArray(ByteStreams.limit(body, MAX_BODY_SIZE)));
Call httpCall =
httpClient.newCall(prepareRequest(url, httpMethod, requestBody, toOkHttpHeaders(headers)));
@ -151,28 +160,4 @@ public class DirectKubernetesAPIAccessHelper {
return headersBuilder.build();
}
private static final class InputStreamBasedRequestBody extends RequestBody {
private final InputStream inputStream;
private final MediaType mediaType;
private InputStreamBasedRequestBody(InputStream is, String contentType) {
this.inputStream = is;
this.mediaType = contentType == null ? null : MediaType.parse(contentType);
}
@Override
public MediaType contentType() {
return mediaType;
}
@Override
public void writeTo(BufferedSink sink) throws IOException {
byte[] buffer = new byte[1024];
int cnt;
while ((cnt = inputStream.read(buffer)) != -1) {
sink.write(buffer, 0, cnt);
}
}
}
}