-
Notifications
You must be signed in to change notification settings - Fork 547
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
RB=144421 R=osumampo,cpettitt,slim,si-dev A=osumampo
- Loading branch information
David Hoa
committed
Apr 1, 2013
1 parent
d35730e
commit 4b922c0
Showing
7 changed files
with
489 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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,7 @@ | ||
dependencies { | ||
compile project(':d2') | ||
compile project(':r2') | ||
compile project(':pegasus-common') | ||
compile project(':li-jersey-uri') | ||
testCompile externalDependency.testng | ||
} |
52 changes: 52 additions & 0 deletions
52
d2-contrib/src/main/java/com/linkedin/d2/contrib/RouteLookup.java
This file contains 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,52 @@ | ||
/* | ||
Copyright (c) 2012 LinkedIn Corp. | ||
Licensed 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. | ||
*/ | ||
|
||
/** | ||
* $Id: $ | ||
*/ | ||
|
||
package com.linkedin.d2.contrib; | ||
|
||
import com.linkedin.common.callback.Callback; | ||
|
||
/** | ||
* This interface is meant to be used in conjunction with a client that implements RoutingAwareClient. | ||
* This can be used when the correct d2 service name to route a request to is not known immediately | ||
* without additional action. For example, userA may map to serviceA, and userB maps to serviceB. In | ||
* this case, the userid can be used as the routeKey to make either an in memory decision or an | ||
* out of band call to determine what service name to return through the callback. | ||
* | ||
* @author David Hoa | ||
* @version $Revision: $ | ||
*/ | ||
|
||
public interface RouteLookup | ||
{ | ||
/** | ||
* This function can be used to return a different service name than the original service | ||
* name. The two primary inputs to modifying the original service name can be location and/or | ||
* routeKey. The new service name (as string) is returned through the Callback. The implementation can | ||
* do any action needed to return the new service name. | ||
* | ||
* This is a non-blocking interface. | ||
* | ||
* @param originalServiceName original service name | ||
* @param location destination descriptor, if needed | ||
* @param routeKey key used to determine a new service name. | ||
* @param callback used to return the new service name. | ||
*/ | ||
void run(String originalServiceName, String location, String routeKey, Callback<String> callback); | ||
} |
151 changes: 151 additions & 0 deletions
151
d2-contrib/src/main/java/com/linkedin/d2/contrib/RouteLookupClient.java
This file contains 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,151 @@ | ||
/* | ||
Copyright (c) 2012 LinkedIn Corp. | ||
Licensed 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. | ||
*/ | ||
|
||
/** | ||
* $Id: $ | ||
*/ | ||
|
||
package com.linkedin.d2.contrib; | ||
|
||
import com.linkedin.common.callback.Callback; | ||
import com.linkedin.common.callback.FutureCallback; | ||
import com.linkedin.d2.balancer.util.LoadBalancerUtil; | ||
import com.linkedin.jersey.api.uri.UriBuilder; | ||
import com.linkedin.r2.message.RequestContext; | ||
import com.linkedin.r2.message.rest.RestRequest; | ||
import com.linkedin.r2.message.rest.RestRequestBuilder; | ||
import com.linkedin.r2.message.rest.RestResponse; | ||
import com.linkedin.r2.transport.common.Client; | ||
|
||
import java.net.URI; | ||
import java.util.concurrent.ExecutionException; | ||
import java.util.concurrent.Future; | ||
|
||
/** | ||
* RouteLookupClient can be used to send normal RestRequests as well as request that require a | ||
* RouteLookup. A RouteLookup can do any action, as long as they implement the interface. | ||
* Currently, only RestRequests are supported in RouteLookupClient when using a RouteLookup. | ||
* | ||
* @author David Hoa | ||
* @version $Revision: $ | ||
*/ | ||
|
||
public class RouteLookupClient implements RoutingAwareClient | ||
{ | ||
|
||
// this is the normal R2 Client that can route ordinary requests | ||
private final Client _client; | ||
|
||
// this is the async user provided action that will be executed first to get a d2 service name | ||
// back in the callback, which will then be used to execute the request. | ||
private final RouteLookup _routeLookup; | ||
|
||
// The routing group that this client is sending requests from. | ||
private final String _routingGroup; | ||
|
||
public RouteLookupClient(Client client, RouteLookup routeLookup, String routingGroup) | ||
{ | ||
_client = client; | ||
_routeLookup = routeLookup; | ||
_routingGroup = routingGroup; | ||
} | ||
|
||
@Override | ||
public void restRequest(RestRequest request, Callback<RestResponse> callback, String routeKey) | ||
{ | ||
this.restRequest(request, new RequestContext(), callback, routeKey); | ||
} | ||
|
||
@Override | ||
public void restRequest(final RestRequest request, final RequestContext requestContext, | ||
final Callback<RestResponse> callback, String routeKey) | ||
{ | ||
String originalServiceName = request.getURI().getAuthority(); | ||
Callback<String> routeLookupCallback = new Callback<String>() { | ||
|
||
@Override | ||
public void onError(Throwable e) | ||
{ | ||
callback.onError(e); | ||
} | ||
|
||
@Override | ||
public void onSuccess(String resultServiceName) | ||
{ | ||
RestRequest resultRequest = createNewRequestWithNewServiceName(request, resultServiceName); | ||
_client.restRequest(resultRequest, requestContext, callback); | ||
} | ||
}; | ||
|
||
_routeLookup.run(originalServiceName, _routingGroup, routeKey, routeLookupCallback); | ||
} | ||
|
||
@Override | ||
public Future<RestResponse> restRequest(RestRequest request, String routeKey) | ||
{ | ||
return this.restRequest(request, new RequestContext(), routeKey); | ||
} | ||
|
||
@Override | ||
public Future<RestResponse> restRequest(final RestRequest request, final RequestContext requestContext, | ||
String routekey) | ||
{ | ||
final FutureCallback<String> futureCallback = new FutureCallback<String>(); | ||
String originalServiceName = LoadBalancerUtil.getServiceNameFromUri(request.getURI()); | ||
String resultServiceName; | ||
_routeLookup.run(originalServiceName, _routingGroup, routekey, futureCallback); | ||
|
||
try | ||
{ | ||
resultServiceName = futureCallback.get(); | ||
} | ||
catch (InterruptedException e) | ||
{ | ||
throw new RuntimeException(e); | ||
} | ||
catch (ExecutionException e) | ||
{ | ||
throw new RuntimeException(e); | ||
} | ||
|
||
RestRequest resultRequest = createNewRequestWithNewServiceName(request, resultServiceName); | ||
Future<RestResponse> resultFuture = _client.restRequest(resultRequest, requestContext); | ||
return resultFuture; | ||
} | ||
|
||
/** | ||
* Creates a new request identical to the original request, but changes the d2 service name to | ||
* the one passed in. | ||
* @param origRequest original request to copy | ||
* @param newServiceName the new service name to rewrite the request with | ||
* @return a new RestRequest | ||
*/ | ||
private static RestRequest createNewRequestWithNewServiceName(RestRequest origRequest, String newServiceName) | ||
{ | ||
RestRequestBuilder modifiedBuilder = origRequest.builder(); | ||
URI originalURI = modifiedBuilder.getURI(); | ||
if (!("d2".equals(originalURI.getScheme()))) | ||
{ | ||
throw new IllegalArgumentException("Unsupported scheme in URI: " + originalURI); | ||
} | ||
UriBuilder modifiedUriBuilder = UriBuilder.fromUri(originalURI); | ||
modifiedUriBuilder.host(newServiceName); | ||
URI resultUri = modifiedUriBuilder.build(); | ||
modifiedBuilder.setURI(resultUri); | ||
RestRequest resultRequest = modifiedBuilder.build(); | ||
return resultRequest; | ||
} | ||
} |
93 changes: 93 additions & 0 deletions
93
d2-contrib/src/main/java/com/linkedin/d2/contrib/RoutingAwareClient.java
This file contains 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,93 @@ | ||
/* | ||
Copyright (c) 2012 LinkedIn Corp. | ||
Licensed 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. | ||
*/ | ||
|
||
/** | ||
* $Id: $ | ||
*/ | ||
|
||
package com.linkedin.d2.contrib; | ||
|
||
import com.linkedin.common.callback.Callback; | ||
import com.linkedin.r2.message.RequestContext; | ||
import com.linkedin.r2.message.rest.RestRequest; | ||
import com.linkedin.r2.message.rest.RestResponse; | ||
|
||
import java.util.concurrent.Future; | ||
|
||
/** | ||
* RoutingAwareClient will currently only support RestRequests with an additional key. | ||
* | ||
* @author David Hoa | ||
* @version $Revision: $ | ||
*/ | ||
|
||
public interface RoutingAwareClient | ||
{ | ||
/** | ||
* This function can be used to send a restRequest with an additional routeKey to determine | ||
* the appropriate d2 service to use for routing the request. An example routeKey might be | ||
* a memberID. It is up to the implementation to convert the routeKey into the correct | ||
* d2 service name. | ||
* | ||
* @param request original rest request | ||
* @param callback used to return the new service name. | ||
* @param routeKey key used to determine a new service name. | ||
*/ | ||
void restRequest(RestRequest request, Callback<RestResponse> callback, String routeKey); | ||
|
||
/** | ||
* This function can be used to send a restRequest with an additional routeKey to determine | ||
* the appropriate d2 service to use for routing the request. An example routeKey might be | ||
* a memberID. It is up to the implementation to convert the routeKey into the correct | ||
* d2 service name. | ||
* | ||
* @param request original rest request | ||
* @param requestContext request context | ||
* @param callback used to return the new service name. | ||
* @param routeKey key used to determine a new service name. | ||
*/ | ||
void restRequest(RestRequest request, RequestContext requestContext, | ||
Callback<RestResponse> callback, String routeKey); | ||
|
||
/** | ||
* This function can be used to send a restRequest with an additional routeKey to determine | ||
* the appropriate d2 service to use for routing the request. An example routeKey might be | ||
* a memberID. It is up to the implementation to convert the routeKey into the correct | ||
* d2 service name. | ||
* | ||
* The returned Future can be used to retrieve the RestResponse. | ||
* | ||
* @param request original rest request | ||
* @param callback used to return the new service name. | ||
* @param routeKey key used to determine a new service name. | ||
*/ | ||
Future<RestResponse> restRequest(RestRequest request, String routeKey); | ||
|
||
/** | ||
* This function can be used to send a restRequest with an additional routeKey to determine | ||
* the appropriate d2 service to use for routing the request. An example routeKey might be | ||
* a memberID. It is up to the implementation to convert the routeKey into the correct | ||
* d2 service name. | ||
* | ||
* The returned Future can be used to retrieve the RestResponse. | ||
* | ||
* @param request original rest request | ||
* @param requestContext request context | ||
* @param callback used to return the new service name. | ||
* @param routeKey key used to determine a new service name. | ||
*/ | ||
Future<RestResponse> restRequest(RestRequest request, RequestContext requestContext, String routekey); | ||
} |
38 changes: 38 additions & 0 deletions
38
d2-contrib/src/test/java/com/linkedin/d2/contrib/SimpleTestRouteLookup.java
This file contains 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,38 @@ | ||
/* | ||
Copyright (c) 2012 LinkedIn Corp. | ||
Licensed 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. | ||
*/ | ||
|
||
/** | ||
* $Id: $ | ||
*/ | ||
|
||
package com.linkedin.d2.contrib; | ||
|
||
import com.linkedin.common.callback.Callback; | ||
|
||
/** | ||
* @author David Hoa | ||
* @version $Revision: $ | ||
*/ | ||
|
||
public class SimpleTestRouteLookup implements RouteLookup | ||
{ | ||
|
||
@Override | ||
public void run(String originalServiceName, String location, String routeKey, Callback<String> callback) | ||
{ | ||
callback.onSuccess(originalServiceName + (location == null ? "" : location) + routeKey + "Foo"); | ||
} | ||
} |
Oops, something went wrong.