You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by ju...@apache.org on 2015/09/17 09:07:46 UTC
incubator-reef git commit: [REEF-758] TcpPortProvider Configuration
is not propagated correctly to the Evaluators
Repository: incubator-reef
Updated Branches:
refs/heads/master d23f26594 -> ed3d8a40e
[REEF-758] TcpPortProvider Configuration is not propagated correctly to the Evaluators
This addressed the issue by
* merging configuration from the configuration providers in function SubmitContextAndService
* shifting the merging of configuration from configuration providers from task to service in SubmitContextAndServiceAndTask
* maintaining the logic that configuration from configuration providers will be merged with service configuration if it is present and with task configuration if service configuration is not to be submitted
JIRA:
[REEF-758](https://issues.apache.org/jira/browse/REEF-758)
This Closes #499
Author: Dhruv <dh...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/ed3d8a40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/ed3d8a40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/ed3d8a40
Branch: refs/heads/master
Commit: ed3d8a40e925b88e9030ed9ce769d56f2d2a4ab0
Parents: d23f265
Author: Dhruv <dh...@gmail.com>
Authored: Wed Sep 16 23:08:08 2015 -0700
Committer: Julia Wang <ju...@microsoft.com>
Committed: Thu Sep 17 00:03:52 2015 -0700
----------------------------------------------------------------------
.../Bridge/Events/AllocatedEvaluator.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ed3d8a40/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs
index f7889eb..bfb0f62 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs
@@ -108,8 +108,9 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
{
LOGGER.Log(Level.Info, "AllocatedEvaluator::SubmitContextAndService");
+ var serviceConf = MergeWithConfigurationProviders(serviceConfiguration);
string context = _serializer.ToString(contextConfiguration);
- string service = _serializer.ToString(WrapServiceConfigAsString(serviceConfiguration));
+ string service = _serializer.ToString(WrapServiceConfigAsString(serviceConf));
LOGGER.Log(Level.Verbose, "serialized contextConfiguration: " + context);
LOGGER.Log(Level.Verbose, "serialized serviceConfiguration: " + service);
@@ -121,10 +122,9 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
{
LOGGER.Log(Level.Info, "AllocatedEvaluator::SubmitContextAndServiceAndTask");
- //TODO: Change this to service configuration when REEF-289(https://issues.apache.org/jira/browse/REEF-289) is fixed.
- taskConfiguration = MergeWithConfigurationProviders(taskConfiguration);
+ var serviceConf = MergeWithConfigurationProviders(serviceConfiguration);
string context = _serializer.ToString(contextConfiguration);
- string service = _serializer.ToString(WrapServiceConfigAsString(serviceConfiguration));
+ string service = _serializer.ToString(WrapServiceConfigAsString(serviceConf));
string task = _serializer.ToString(taskConfiguration);
LOGGER.Log(Level.Verbose, "serialized contextConfiguration: " + context);