michael-o commented on a change in pull request #304: URL: https://github.com/apache/httpcomponents-client/pull/304#discussion_r619830704
########## File path: httpclient5-testing/src/main/java/org/apache/hc/client5/testing/async/ServiceUnavailableAsyncDecorator.java ########## @@ -0,0 +1,138 @@ +/* + * ==================================================================== + * 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. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + * + */ + +package org.apache.hc.client5.testing.async; + +import org.apache.hc.core5.function.Resolver; +import org.apache.hc.core5.http.EntityDetails; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpRequest; +import org.apache.hc.core5.http.HttpResponse; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.hc.core5.http.HttpVersion; +import org.apache.hc.core5.http.ProtocolVersion; +import org.apache.hc.core5.http.message.BasicHttpResponse; +import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler; +import org.apache.hc.core5.http.nio.CapacityChannel; +import org.apache.hc.core5.http.nio.DataStreamChannel; +import org.apache.hc.core5.http.nio.ResponseChannel; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.util.Args; +import org.apache.hc.core5.util.TimeValue; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +public class ServiceUnavailableAsyncDecorator implements AsyncServerExchangeHandler { + + private final AsyncServerExchangeHandler exchangeHandler; + private final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver; + private final AtomicBoolean serviceUnavailable; + + public ServiceUnavailableAsyncDecorator(final AsyncServerExchangeHandler exchangeHandler, + final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver) { + this.exchangeHandler = Args.notNull(exchangeHandler, "Exchange handler"); + this.serviceAvailabilityResolver = Args.notNull(serviceAvailabilityResolver, "Service availability resolver"); + this.serviceUnavailable = new AtomicBoolean(); + } + + @Override + public void handleRequest(final HttpRequest request, + final EntityDetails entityDetails, + final ResponseChannel responseChannel, + final HttpContext context) throws HttpException, IOException { + final TimeValue retryAfter = serviceAvailabilityResolver.resolve(request); + serviceUnavailable.set(TimeValue.isPositive(retryAfter)); + if (serviceUnavailable.get()) { + final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_SERVICE_UNAVAILABLE); + response.addHeader(HttpHeaders.RETRY_AFTER, Long.toString(retryAfter.toSeconds())); + final ProtocolVersion version = request.getVersion(); + if (version != null && version.compareToVersion(HttpVersion.HTTP_2) < 0) { Review comment: Why close if version is 1.1+? ########## File path: httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalAbstractHttpAsyncClient.java ########## @@ -104,6 +110,7 @@ this.credentialsProvider = credentialsProvider; this.defaultConfig = defaultConfig; this.closeables = closeables != null ? new ConcurrentLinkedQueue<>(closeables) : null; + this.scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory("Scheduled-executor")); Review comment: Maybe the factory should be distinguishable between client instances in one VM...? ########## File path: httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalAbstractHttpAsyncClient.java ########## @@ -122,6 +129,7 @@ void internalClose(final CloseMode closeMode) { } } } + this.scheduledExecutorService.shutdown(); Review comment: Stupid question: Should this block indefinitely if there is hight low or requests take long? No strong opinion here. ########## File path: httpclient5-testing/src/main/java/org/apache/hc/client5/testing/async/ServiceUnavailableAsyncDecorator.java ########## @@ -0,0 +1,138 @@ +/* + * ==================================================================== + * 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. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + * + */ + +package org.apache.hc.client5.testing.async; + +import org.apache.hc.core5.function.Resolver; +import org.apache.hc.core5.http.EntityDetails; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpRequest; +import org.apache.hc.core5.http.HttpResponse; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.hc.core5.http.HttpVersion; +import org.apache.hc.core5.http.ProtocolVersion; +import org.apache.hc.core5.http.message.BasicHttpResponse; +import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler; +import org.apache.hc.core5.http.nio.CapacityChannel; +import org.apache.hc.core5.http.nio.DataStreamChannel; +import org.apache.hc.core5.http.nio.ResponseChannel; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.util.Args; +import org.apache.hc.core5.util.TimeValue; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +public class ServiceUnavailableAsyncDecorator implements AsyncServerExchangeHandler { + + private final AsyncServerExchangeHandler exchangeHandler; + private final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver; + private final AtomicBoolean serviceUnavailable; + + public ServiceUnavailableAsyncDecorator(final AsyncServerExchangeHandler exchangeHandler, + final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver) { + this.exchangeHandler = Args.notNull(exchangeHandler, "Exchange handler"); + this.serviceAvailabilityResolver = Args.notNull(serviceAvailabilityResolver, "Service availability resolver"); + this.serviceUnavailable = new AtomicBoolean(); + } + + @Override + public void handleRequest(final HttpRequest request, + final EntityDetails entityDetails, + final ResponseChannel responseChannel, + final HttpContext context) throws HttpException, IOException { + final TimeValue retryAfter = serviceAvailabilityResolver.resolve(request); + serviceUnavailable.set(TimeValue.isPositive(retryAfter)); + if (serviceUnavailable.get()) { + final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_SERVICE_UNAVAILABLE); + response.addHeader(HttpHeaders.RETRY_AFTER, Long.toString(retryAfter.toSeconds())); + final ProtocolVersion version = request.getVersion(); + if (version != null && version.compareToVersion(HttpVersion.HTTP_2) < 0) { Review comment: Sorry, my question was misleading. Once again: Why close the connection of th version is exactly 1.1? ########## File path: httpclient5-testing/src/main/java/org/apache/hc/client5/testing/async/ServiceUnavailableAsyncDecorator.java ########## @@ -0,0 +1,138 @@ +/* + * ==================================================================== + * 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. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + * + */ + +package org.apache.hc.client5.testing.async; + +import org.apache.hc.core5.function.Resolver; +import org.apache.hc.core5.http.EntityDetails; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpRequest; +import org.apache.hc.core5.http.HttpResponse; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.hc.core5.http.HttpVersion; +import org.apache.hc.core5.http.ProtocolVersion; +import org.apache.hc.core5.http.message.BasicHttpResponse; +import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler; +import org.apache.hc.core5.http.nio.CapacityChannel; +import org.apache.hc.core5.http.nio.DataStreamChannel; +import org.apache.hc.core5.http.nio.ResponseChannel; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.util.Args; +import org.apache.hc.core5.util.TimeValue; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +public class ServiceUnavailableAsyncDecorator implements AsyncServerExchangeHandler { + + private final AsyncServerExchangeHandler exchangeHandler; + private final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver; + private final AtomicBoolean serviceUnavailable; + + public ServiceUnavailableAsyncDecorator(final AsyncServerExchangeHandler exchangeHandler, + final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver) { + this.exchangeHandler = Args.notNull(exchangeHandler, "Exchange handler"); + this.serviceAvailabilityResolver = Args.notNull(serviceAvailabilityResolver, "Service availability resolver"); + this.serviceUnavailable = new AtomicBoolean(); + } + + @Override + public void handleRequest(final HttpRequest request, + final EntityDetails entityDetails, + final ResponseChannel responseChannel, + final HttpContext context) throws HttpException, IOException { + final TimeValue retryAfter = serviceAvailabilityResolver.resolve(request); + serviceUnavailable.set(TimeValue.isPositive(retryAfter)); + if (serviceUnavailable.get()) { + final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_SERVICE_UNAVAILABLE); + response.addHeader(HttpHeaders.RETRY_AFTER, Long.toString(retryAfter.toSeconds())); + final ProtocolVersion version = request.getVersion(); + if (version != null && version.compareToVersion(HttpVersion.HTTP_2) < 0) { Review comment: Well, from an abstract point of view this connection is used to a host:port pair, but the URI path can be proxied to to other backend servers as well. E.g., `example.com/service1` and `example.com/service2` can be to completely different backends where service1 is offline, but service2 not. ########## File path: httpclient5-testing/src/main/java/org/apache/hc/client5/testing/async/ServiceUnavailableAsyncDecorator.java ########## @@ -0,0 +1,138 @@ +/* + * ==================================================================== + * 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. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + * + */ + +package org.apache.hc.client5.testing.async; + +import org.apache.hc.core5.function.Resolver; +import org.apache.hc.core5.http.EntityDetails; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpRequest; +import org.apache.hc.core5.http.HttpResponse; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.hc.core5.http.HttpVersion; +import org.apache.hc.core5.http.ProtocolVersion; +import org.apache.hc.core5.http.message.BasicHttpResponse; +import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler; +import org.apache.hc.core5.http.nio.CapacityChannel; +import org.apache.hc.core5.http.nio.DataStreamChannel; +import org.apache.hc.core5.http.nio.ResponseChannel; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.util.Args; +import org.apache.hc.core5.util.TimeValue; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +public class ServiceUnavailableAsyncDecorator implements AsyncServerExchangeHandler { + + private final AsyncServerExchangeHandler exchangeHandler; + private final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver; + private final AtomicBoolean serviceUnavailable; + + public ServiceUnavailableAsyncDecorator(final AsyncServerExchangeHandler exchangeHandler, + final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver) { + this.exchangeHandler = Args.notNull(exchangeHandler, "Exchange handler"); + this.serviceAvailabilityResolver = Args.notNull(serviceAvailabilityResolver, "Service availability resolver"); + this.serviceUnavailable = new AtomicBoolean(); + } + + @Override + public void handleRequest(final HttpRequest request, + final EntityDetails entityDetails, + final ResponseChannel responseChannel, + final HttpContext context) throws HttpException, IOException { + final TimeValue retryAfter = serviceAvailabilityResolver.resolve(request); + serviceUnavailable.set(TimeValue.isPositive(retryAfter)); + if (serviceUnavailable.get()) { + final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_SERVICE_UNAVAILABLE); + response.addHeader(HttpHeaders.RETRY_AFTER, Long.toString(retryAfter.toSeconds())); + final ProtocolVersion version = request.getVersion(); + if (version != null && version.compareToVersion(HttpVersion.HTTP_2) < 0) { Review comment: I am neither, I am just trying to clarify that the status code from the server applies solely to the path of the request and it does not give you any idicator that anything else served by this server is unavailable thus making the entire connection invalid . I don't consider the connection to be invalid unless TCP tells me otherwise or the server tells me to close. ########## File path: httpclient5-testing/src/main/java/org/apache/hc/client5/testing/async/ServiceUnavailableAsyncDecorator.java ########## @@ -0,0 +1,138 @@ +/* + * ==================================================================== + * 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. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + * + */ + +package org.apache.hc.client5.testing.async; + +import org.apache.hc.core5.function.Resolver; +import org.apache.hc.core5.http.EntityDetails; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpRequest; +import org.apache.hc.core5.http.HttpResponse; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.hc.core5.http.HttpVersion; +import org.apache.hc.core5.http.ProtocolVersion; +import org.apache.hc.core5.http.message.BasicHttpResponse; +import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler; +import org.apache.hc.core5.http.nio.CapacityChannel; +import org.apache.hc.core5.http.nio.DataStreamChannel; +import org.apache.hc.core5.http.nio.ResponseChannel; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.util.Args; +import org.apache.hc.core5.util.TimeValue; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +public class ServiceUnavailableAsyncDecorator implements AsyncServerExchangeHandler { + + private final AsyncServerExchangeHandler exchangeHandler; + private final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver; + private final AtomicBoolean serviceUnavailable; + + public ServiceUnavailableAsyncDecorator(final AsyncServerExchangeHandler exchangeHandler, + final Resolver<HttpRequest, TimeValue> serviceAvailabilityResolver) { + this.exchangeHandler = Args.notNull(exchangeHandler, "Exchange handler"); + this.serviceAvailabilityResolver = Args.notNull(serviceAvailabilityResolver, "Service availability resolver"); + this.serviceUnavailable = new AtomicBoolean(); + } + + @Override + public void handleRequest(final HttpRequest request, + final EntityDetails entityDetails, + final ResponseChannel responseChannel, + final HttpContext context) throws HttpException, IOException { + final TimeValue retryAfter = serviceAvailabilityResolver.resolve(request); + serviceUnavailable.set(TimeValue.isPositive(retryAfter)); + if (serviceUnavailable.get()) { + final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_SERVICE_UNAVAILABLE); + response.addHeader(HttpHeaders.RETRY_AFTER, Long.toString(retryAfter.toSeconds())); + final ProtocolVersion version = request.getVersion(); + if (version != null && version.compareToVersion(HttpVersion.HTTP_2) < 0) { Review comment: Duh, I am an idiot. I didn't notice this. So this spot is fine. Sorry for the noise. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
