Feature/cstackex-01: Primary Storage pool creation #16
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.cloudstack.storage.feign; | ||
|
|
||
| import feign.Feign; | ||
|
|
||
| public class FeignClientFactory { | ||
|
|
||
| private final FeignConfiguration feignConfiguration; | ||
|
|
||
| public FeignClientFactory() { | ||
| this.feignConfiguration = new FeignConfiguration(); | ||
| } | ||
|
|
||
| public FeignClientFactory(FeignConfiguration feignConfiguration) { | ||
| this.feignConfiguration = feignConfiguration; | ||
| } | ||
|
|
||
| public <T> T createClient(Class<T> clientClass, String baseURL) { | ||
| return Feign.builder() | ||
| .client(feignConfiguration.createClient()) | ||
| .encoder(feignConfiguration.createEncoder()) | ||
| .decoder(feignConfiguration.createDecoder()) | ||
| // .logger(feignConfiguration.createLogger()) | ||
| .retryer(feignConfiguration.createRetryer()) | ||
| .requestInterceptor(feignConfiguration.createRequestInterceptor()) | ||
| .target(clientClass, baseURL); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -19,41 +19,51 @@ | |||||
|
|
||||||
| package org.apache.cloudstack.storage.feign; | ||||||
|
|
||||||
| import feign.RequestInterceptor; | ||||||
| import feign.Retryer; | ||||||
| import feign.Client; | ||||||
| import feign.httpclient.ApacheHttpClient; | ||||||
| import feign.codec.Decoder; | ||||||
| import feign.codec.Encoder; | ||||||
| //import feign.slf4j.Slf4jLogger; | ||||||
| import feign.Response; | ||||||
| import feign.codec.DecodeException; | ||||||
| import feign.codec.EncodeException; | ||||||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||||||
| import com.fasterxml.jackson.databind.DeserializationFeature; | ||||||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||||||
| import org.apache.http.conn.ConnectionKeepAliveStrategy; | ||||||
| import org.apache.http.conn.ssl.NoopHostnameVerifier; | ||||||
| import org.apache.http.conn.ssl.SSLConnectionSocketFactory; | ||||||
| import org.apache.http.conn.ssl.TrustAllStrategy; | ||||||
| import org.apache.http.impl.client.CloseableHttpClient; | ||||||
| import org.apache.http.impl.client.HttpClientBuilder; | ||||||
| import org.apache.http.ssl.SSLContexts; | ||||||
| import org.apache.logging.log4j.LogManager; | ||||||
| import org.apache.logging.log4j.Logger; | ||||||
|
|
||||||
| import javax.net.ssl.SSLContext; | ||||||
| import java.io.IOException; | ||||||
| import java.lang.reflect.Type; | ||||||
| import java.nio.charset.StandardCharsets; | ||||||
| import java.util.concurrent.TimeUnit; | ||||||
|
|
||||||
| public class FeignConfiguration { | ||||||
| private static final Logger logger = LogManager.getLogger(FeignConfiguration.class); | ||||||
|
|
||||||
| private final int retryMaxAttempt = 3; | ||||||
| private final int retryMaxInterval = 5; | ||||||
| private final String ontapFeignMaxConnection = "80"; | ||||||
| private final String ontapFeignMaxConnectionPerRoute = "20"; | ||||||
| private final ObjectMapper objectMapper; | ||||||
|
|
||||||
| public FeignConfiguration() { | ||||||
| this.objectMapper = new ObjectMapper(); | ||||||
|
Collaborator
Author
There was a problem hiding this comment. Check out if json mapper could be used here to ignore unknown properties |
||||||
| // Configure ObjectMapper to ignore unknown properties like _links | ||||||
| this.objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); | ||||||
| } | ||||||
|
|
||||||
| public Client createClient() { | ||||||
| int maxConn; | ||||||
| int maxConnPerRoute; | ||||||
| try { | ||||||
|
|
@@ -68,10 +78,11 @@ public Client client(ApacheHttpClientFactory httpClientFactory) { | |||||
| logger.error("ontapFeignClient: encounter exception while parse the max connection per route from env. setting default value"); | ||||||
| maxConnPerRoute = 2; | ||||||
| } | ||||||
|
|
||||||
| // Disable Keep Alive for Http Connection | ||||||
| logger.debug("ontapFeignClient: Setting the feign client config values as max connection: {}, max connections per route: {}", maxConn, maxConnPerRoute); | ||||||
| ConnectionKeepAliveStrategy keepAliveStrategy = (response, context) -> 0; | ||||||
| CloseableHttpClient httpClient = HttpClientBuilder.create() | ||||||
| .setMaxConnTotal(maxConn) | ||||||
| .setMaxConnPerRoute(maxConnPerRoute) | ||||||
| .setKeepAliveStrategy(keepAliveStrategy) | ||||||
|
|
@@ -91,22 +102,62 @@ private SSLConnectionSocketFactory getSSLSocketFactory() { | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| public RequestInterceptor createRequestInterceptor() { | ||||||
| return template -> { | ||||||
| logger.info("Feign Request URL: {}", template.url()); | ||||||
| logger.info("HTTP Method: {}", template.method()); | ||||||
| logger.info("Headers: {}", template.headers()); | ||||||
| if (template.body() != null) { | ||||||
| logger.info("Body: {}", new String(template.body())); | ||||||
| } | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| public Retryer createRetryer() { | ||||||
| return new Retryer.Default(1000L, retryMaxInterval * 1000L, retryMaxAttempt); | ||||||
| } | ||||||
|
|
||||||
| public Encoder createEncoder() { | ||||||
| return new Encoder() { | ||||||
| @Override | ||||||
| public void encode(Object object, Type bodyType, feign.RequestTemplate template) throws EncodeException { | ||||||
| if (object == null) { | ||||||
| template.body((byte[]) null, StandardCharsets.UTF_8); | ||||||
|
There was a problem hiding this comment. Casting
Suggested change
|
||||||
| return; | ||||||
| } | ||||||
| try { | ||||||
| byte[] jsonBytes = objectMapper.writeValueAsBytes(object); | ||||||
| template.body(jsonBytes, StandardCharsets.UTF_8); | ||||||
| template.header("Content-Type", "application/json"); | ||||||
| } catch (JsonProcessingException e) { | ||||||
| throw new EncodeException("Error encoding object to JSON", e); | ||||||
| } | ||||||
| } | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| public Decoder createDecoder() { | ||||||
| return new Decoder() { | ||||||
| @Override | ||||||
| public Object decode(Response response, Type type) throws IOException, DecodeException { | ||||||
| if (response.body() == null) { | ||||||
| return null; | ||||||
| } | ||||||
| String json = null; | ||||||
| try (var bodyStream = response.body().asInputStream()) { | ||||||
|
There was a problem hiding this comment. [nitpick] Using 'var' for type inference is valid in Java 11+, but may reduce code readability. Consider explicitly declaring the type as 'InputStream bodyStream' for clarity.
Suggested change
|
||||||
| json = new String(bodyStream.readAllBytes(), StandardCharsets.UTF_8); | ||||||
| logger.debug("Decoding JSON response: {}", json); | ||||||
| return objectMapper.readValue(json, objectMapper.getTypeFactory().constructType(type)); | ||||||
| } catch (IOException e) { | ||||||
| logger.error("Error decoding JSON response. Status: {}, Raw body: {}", response.status(), json, e); | ||||||
| throw new DecodeException(response.status(), "Error decoding JSON response", response.request(), e); | ||||||
| } | ||||||
| } | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| // public Slf4jLogger createLogger() { | ||||||
| // return new Slf4jLogger(); | ||||||
| // } | ||||||
| } | ||||||
|
|
||||||
|
rajiv-jain-netapp marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
rajiv-jain-netapp marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.