Repository: reef Updated Branches: refs/heads/master 0bb388e8c -> 58a86f9b1
[REEF-1156] REEF-1019 doesn't handle dfsJobSubmissionFolder NULL default properly This addressed the issue by * Generating the Avro codegen-ed file for * AvroYarnJobSubmissionParameters and merging it with existing file * Minor: Make README.md accessible in Visual Studio JIRA: [REEF-1156](https://issues.apache.org/jira/browse/REEF-1156) Pull Request: Closes #796 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/58a86f9b Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/58a86f9b Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/58a86f9b Branch: refs/heads/master Commit: 58a86f9b1e7c58b71ee693b2267abcd32f10973b Parents: 0bb388e Author: Anupam <[email protected]> Authored: Mon Jan 25 16:19:28 2016 -0800 Committer: Andrew Chung <[email protected]> Committed: Tue Jan 26 14:41:35 2016 -0800 ---------------------------------------------------------------------- .../Avro/YARN/AvroYarnJobSubmissionParameters.cs | 3 ++- lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/58a86f9b/lang/cs/Org.Apache.REEF.Client/Avro/YARN/AvroYarnJobSubmissionParameters.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Avro/YARN/AvroYarnJobSubmissionParameters.cs b/lang/cs/Org.Apache.REEF.Client/Avro/YARN/AvroYarnJobSubmissionParameters.cs index 36c5806..65f96c3 100644 --- a/lang/cs/Org.Apache.REEF.Client/Avro/YARN/AvroYarnJobSubmissionParameters.cs +++ b/lang/cs/Org.Apache.REEF.Client/Avro/YARN/AvroYarnJobSubmissionParameters.cs @@ -28,7 +28,7 @@ namespace Org.Apache.REEF.Client.Avro.YARN [DataContract(Namespace = "org.apache.reef.reef.bridge.client.avro")] public sealed class AvroYarnJobSubmissionParameters { - private const string JsonSchema = @"{""type"":""record"",""name"":""org.apache.reef.reef.bridge.client.avro.AvroYarnJobSubmissionParameters"",""doc"":""General cross-language submission parameters to the YARN runtime"",""fields"":[{""name"":""sharedJobSubmissionParameters"",""type"":{""type"":""record"",""name"":""org.apache.reef.reef.bridge.client.avro.AvroJobSubmissionParameters"",""doc"":""General cross-language submission parameters shared by all runtimes"",""fields"":[{""name"":""jobId"",""type"":""string""},{""name"":""tcpBeginPort"",""type"":""int""},{""name"":""tcpRangeCount"",""type"":""int""},{""name"":""tcpTryCount"",""type"":""int""},{""name"":""jobSubmissionFolder"",""type"":""string""}]}},{""name"":""driverMemory"",""type"":""int""},{""name"":""driverRecoveryTimeout"",""type"":""int""},{""name"":""dfsJobSubmissionFolder"",""type"":""string"",""default"":""NULL""},{""name"":""jobSubmissionDirectoryPrefix"",""type"":""string""}]}"; + private const string JsonSchema = @"{""type"":""record"",""name"":""org.apache.reef.reef.bridge.client.avro.AvroYarnJobSubmissionParameters"",""doc"":""General cross-language submission parameters to the YARN runtime"",""fields"":[{""name"":""sharedJobSubmissionParameters"",""type"":{""type"":""record"",""name"":""org.apache.reef.reef.bridge.client.avro.AvroJobSubmissionParameters"",""doc"":""General cross-language submission parameters shared by all runtimes"",""fields"":[{""name"":""jobId"",""type"":""string""},{""name"":""tcpBeginPort"",""type"":""int""},{""name"":""tcpRangeCount"",""type"":""int""},{""name"":""tcpTryCount"",""type"":""int""},{""name"":""jobSubmissionFolder"",""type"":""string""}]}},{""name"":""driverMemory"",""type"":""int""},{""name"":""driverRecoveryTimeout"",""type"":""int""},{""name"":""dfsJobSubmissionFolder"",""type"":""string""},{""name"":""jobSubmissionDirectoryPrefix"",""type"":""string""}]}"; /// <summary> /// Gets the schema. @@ -76,6 +76,7 @@ namespace Org.Apache.REEF.Client.Avro.YARN /// </summary> public AvroYarnJobSubmissionParameters() { + this.dfsJobSubmissionFolder = "NULL"; } /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/58a86f9b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj index d44b14d..df01b65 100644 --- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj +++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj @@ -145,6 +145,7 @@ under the License. <Compile Include="YARN\YarnREEFDotNetClient.cs" /> </ItemGroup> <ItemGroup> + <None Include="Avro\README.md" /> <None Include="Org.Apache.REEF.Client.nuspec" /> <None Include="packages.config" /> </ItemGroup>
