Skip to content

Ported AWS providers to the new configuration format. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
galvesribeiro wants to merge 8 commits into
base: PersistentStreamProviderToLifecycle
Choose a base branch
from
Open

Ported AWS providers to the new configuration format. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae0a065
Replaced AzureTableStorage with AzureTableGrainStorage.
jason-bragg Feb 7, 2018
3e9e5c5
Addressed PR feedback and minor formatter cleanup.
jason-bragg Feb 7, 2018
3919d02
Moved persistent stream provider to use options and lifecycle.
jason-bragg Feb 15, 2018
ed644c4
Move persistent stream provider use options and lifecycle
jason-bragg Feb 16, 2018
d18ddd5
More test fixes
jason-bragg Feb 16, 2018
af1714a
Fixed bug in names services introduced while adding support for facto…
jason-bragg Feb 16, 2018
d5eede5
Cleanup and addressed PR comments
jason-bragg Feb 16, 2018
78bc947
Ported AWS providers to the new configuration format.
galvesribeiro Feb 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions src/AWS/Orleans.Clustering.DynamoDB/AWSUtilsHostingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using Microsoft.Extensions.DependencyInjection;
using Orleans.Messaging;
using Orleans.Runtime.Membership;
using Orleans.Runtime.MembershipService;
using Microsoft.Extensions.DependencyInjection;
using Orleans.Clustering.DynamoDB;
using Orleans.Configuration;
using Orleans.Messaging;
using System;

namespace Orleans.Hosting
{
Expand All @@ -23,7 +22,7 @@ public static class AwsUtilsHostingExtensions
/// </returns>
public static ISiloHostBuilder UseDynamoDBClustering(
this ISiloHostBuilder builder,
Action<DynamoDBClusteringSiloOptions> configureOptions)
Action<DynamoDBClusteringOptions> configureOptions)
{
return builder.ConfigureServices(
services =>
Expand Down Expand Up @@ -51,12 +50,12 @@ public static ISiloHostBuilder UseDynamoDBClustering(
/// </returns>
public static ISiloHostBuilder UseDynamoDBClustering(
this ISiloHostBuilder builder,
Action<OptionsBuilder<DynamoDBClusteringSiloOptions>> configureOptions)
Action<OptionsBuilder<DynamoDBClusteringOptions>> configureOptions)
{
return builder.ConfigureServices(
services =>
{
configureOptions?.Invoke(services.AddOptions<DynamoDBClusteringSiloOptions>());
configureOptions?.Invoke(services.AddOptions<DynamoDBClusteringOptions>());
services.AddSingleton<IMembershipTable, DynamoDBMembershipTable>();
});
}
Expand All @@ -75,7 +74,7 @@ public static ISiloHostBuilder UseDynamoDBClustering(
/// </returns>
public static IClientBuilder UseDynamoDBClustering(
this IClientBuilder builder,
Action<DynamoDBClusteringClientOptions> configureOptions)
Action<DynamoDBGatewayOptions> configureOptions)
{
return builder.ConfigureServices(
services =>
Expand Down Expand Up @@ -103,12 +102,12 @@ public static IClientBuilder UseDynamoDBClustering(
/// </returns>
public static IClientBuilder UseDynamoDBClustering(
this IClientBuilder builder,
Action<OptionsBuilder<DynamoDBClusteringClientOptions>> configureOptions)
Action<OptionsBuilder<DynamoDBGatewayOptions>> configureOptions)
{
return builder.ConfigureServices(
services =>
{
configureOptions?.Invoke(services.AddOptions<DynamoDBClusteringClientOptions>());
configureOptions?.Invoke(services.AddOptions<DynamoDBGatewayOptions>());
services.AddSingleton<IGatewayListProvider, DynamoDBGatewayListProvider>();
});
}
Expand Down
47 changes: 24 additions & 23 deletions src/AWS/Orleans.Clustering.DynamoDB/Membership/DynamoDBGatewayListProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,44 @@
using Amazon.DynamoDBv2;
using Amazon.DynamoDBv2.Model;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Orleans.Configuration;
using Orleans.Messaging;
using Orleans.Runtime.Configuration;
using Orleans.Runtime;
using Orleans.Runtime.MembershipService;
using System;
using System.Collections.Generic;
using System.Net;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Orleans.Clustering.DynamoDB;
using Orleans.Configuration;

namespace Orleans.Runtime.Membership
namespace Orleans.Clustering.DynamoDB
{
internal class DynamoDBGatewayListProvider : IGatewayListProvider
{
private const string TABLE_NAME_DEFAULT_VALUE = "OrleansSiloInstances";

private DynamoDBStorage storage;
private string clusterId;
private DynamoDBStorage _storage;
private string _clusterId;
private readonly string INSTANCE_STATUS_ACTIVE = ((int)SiloStatus.Active).ToString();
private readonly ILoggerFactory loggerFactory;
private readonly DynamoDBClusteringClientOptions options;
private readonly TimeSpan maxStaleness;
public DynamoDBGatewayListProvider(ILoggerFactory loggerFactory, ClientConfiguration clientConfiguration, IOptions<DynamoDBClusteringClientOptions> options, IOptions<ClusterClientOptions> clusterClientOptions)
private readonly ILoggerFactory _loggerFactory;
private readonly DynamoDBGatewayOptions _options;
private readonly TimeSpan _maxStaleness;

public DynamoDBGatewayListProvider(ILoggerFactory loggerFactory, IOptions<DynamoDBGatewayOptions> options,
IOptions<ClusterClientOptions> clusterClientOptions, IOptions<GatewayOptions> gatewayOptions)
{
this.loggerFactory = loggerFactory;
this.options = options.Value;
this.clusterId = clusterClientOptions.Value.ClusterId;
this.maxStaleness = clientConfiguration.GatewayListRefreshPeriod;
this._loggerFactory = loggerFactory;
this._options = options.Value;
this._clusterId = clusterClientOptions.Value.ClusterId;
this._maxStaleness = gatewayOptions.Value.GatewayListRefreshPeriod;
}

#region Implementation of IGatewayListProvider

public Task InitializeGatewayListProvider()
{
storage = new DynamoDBStorage(loggerFactory, options.AccessKey, options.SecretKey, options.Service, options.ReadCapacityUnits, options.WriteCapacityUnits);
return storage.InitializeTable(TABLE_NAME_DEFAULT_VALUE,
this._storage = new DynamoDBStorage(this._loggerFactory, this._options.Service, this._options.AccessKey, this._options.SecretKey,
this._options.ReadCapacityUnits, this._options.WriteCapacityUnits);

return this._storage.InitializeTable(this._options.TableName,
new List<KeySchemaElement>
{
new KeySchemaElement { AttributeName = SiloInstanceRecord.DEPLOYMENT_ID_PROPERTY_NAME, KeyType = KeyType.HASH },
Expand All @@ -54,17 +55,17 @@ public async Task<IList<Uri>> GetGateways()
{
var expressionValues = new Dictionary<string, AttributeValue>
{
{ $":{SiloInstanceRecord.DEPLOYMENT_ID_PROPERTY_NAME}", new AttributeValue(this.clusterId) },
{ $":{SiloInstanceRecord.DEPLOYMENT_ID_PROPERTY_NAME}", new AttributeValue(this._clusterId) },
{ $":{SiloInstanceRecord.STATUS_PROPERTY_NAME}", new AttributeValue { N = INSTANCE_STATUS_ACTIVE } },
{ $":{SiloInstanceRecord.PROXY_PORT_PROPERTY_NAME}", new AttributeValue { N = "0"} }
};

var expression =
$"{SiloInstanceRecord.DEPLOYMENT_ID_PROPERTY_NAME} = :{SiloInstanceRecord.DEPLOYMENT_ID_PROPERTY_NAME} " +
$"AND {SiloInstanceRecord.STATUS_PROPERTY_NAME} = :{SiloInstanceRecord.STATUS_PROPERTY_NAME} " +
$"AND {SiloInstanceRecord.STATUS_PROPERTY_NAME} = :{SiloInstanceRecord.STATUS_PROPERTY_NAME} " +
$"AND {SiloInstanceRecord.PROXY_PORT_PROPERTY_NAME} > :{SiloInstanceRecord.PROXY_PORT_PROPERTY_NAME}";

var records = await storage.ScanAsync<Uri>(TABLE_NAME_DEFAULT_VALUE, expressionValues,
var records = await _storage.ScanAsync<Uri>(this._options.TableName, expressionValues,
expression, gateway =>
{
return SiloAddress.New(
Expand All @@ -79,7 +80,7 @@ public async Task<IList<Uri>> GetGateways()

public TimeSpan MaxStaleness
{
get { return this.maxStaleness; }
get { return this._maxStaleness; }
}

public bool IsUpdatable
Expand Down
Loading