6245535001

Committed 20 Sep 2023 07:44AM UTC coverage: 57.013%. First build

Build # 6245535001

Build Type

push

github

Committed by

web-flow

Commit Message

8.1.0 Release (#1628)

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.0.5 to 5.1.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.5...v5.1.0)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

* Fix -r flag - should have been --results-directory all along

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

* Bump YamlDotNet from 12.0.2 to 12.1.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.0.2 to 12.1.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.0.2...v12.1.0)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Moq from 4.18.2 to 4.18.3

Bumps [Moq](https://github.com/moq/moq4) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.18.2...v4.18.3)

---
updated-dependencies:
- dependency-name: Moq
... (continued)

Run Details

10732 of 20257 branches covered (0.0%)

Branch coverage included in aggregate %.

48141 of 48141 new or added lines in 1086 files covered. (100.0%)

30685 of 52388 relevant lines covered (58.57%)

7387.88 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

52.17

/Rdmp.Core/DataLoad/Engine/LoadExecution/SingleJobExecution.cs

// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.Collections.Generic;
using Rdmp.Core.DataFlowPipeline;
using Rdmp.Core.DataLoad.Engine.Job;
using Rdmp.Core.DataLoad.Engine.LoadExecution.Components;
using Rdmp.Core.ReusableLibraryCode.Progress;

namespace Rdmp.Core.DataLoad.Engine.LoadExecution;

/// <summary>
/// Pipeline which processes a single job through all stages before accepting another.  Execution involves running each DataLoadComponent with the current
/// IDataLoadJob and then disposing them.
/// </summary>
public class SingleJobExecution : IDataLoadExecution
{
    public List<IDataLoadComponent> Components { get; set; }


    public SingleJobExecution(List<IDataLoadComponent> components)
    {
        Components = components;
    }

    /// <summary>
    /// 
    /// </summary>
    /// <returns></returns>
    /// <exception cref="OperationCanceledException"></exception>
    public ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
    {
        job.StartLogging();
        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
            $"Starting load for {job.LoadMetadata.Name}"));

        try
        {
            foreach (var component in Components)
            {
                cancellationToken.ThrowIfAbortRequested();

                try
                {
                    //schedule the component for disposal
                    job.PushForDisposal(component);

                    //run current component
                    var exitCodeType = component.Run(job, cancellationToken);

                    //current component failed so jump out, either because load not nessesary or crash
                    if (exitCodeType == ExitCodeType.OperationNotRequired)
                    {
                        TryDispose(exitCodeType, job);
                        //load not nessesary so abort entire DLE process but also cleanup still
                        return exitCodeType;
                    }

                    if (exitCodeType != ExitCodeType.Success)
                        throw new Exception($"Component {component.Description} returned result {exitCodeType}");
                }
                catch (OperationCanceledException e)
                {
                    job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                        $"{component.Description} has been cancelled by the user", e));
                    throw;
                }
                catch (Exception e)
                {
                    job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                        $"{component.Description} crashed while running Job ", e));
                    job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Job crashed", e));
                    TryDispose(ExitCodeType.Error, job);
                    return ExitCodeType.Error;
                }
            }

            TryDispose(ExitCodeType.Success, job);

            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Completed job {job.JobID}"));

            if (job.CrashAtEndMessages.Count > 0)
            {
                job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                    $"There were {job.CrashAtEndMessages.Count} {nameof(IDataLoadJob.CrashAtEndMessages)} registered for job {job.JobID}"));

                // pop the messages into the handler
                foreach (var m in
                         job.CrashAtEndMessages)
                    job.OnNotify(job, m); // depending on the listener these may break flow of control (e.g.
                                          // return failed (even if the messages are all warnings)
                TryDispose(ExitCodeType.Error, job);
                return ExitCodeType.Error;
            }
            //here
            TryDispose(ExitCodeType.Success, job);
            return ExitCodeType.Success;
        }
        catch (OperationCanceledException)
        {
            if (cancellationToken.IsAbortRequested)
                job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                    $"Job {job.JobID}cancelled in pipeline"));

            TryDispose(cancellationToken.IsAbortRequested ? ExitCodeType.Abort : ExitCodeType.Success, job);
            throw;
        }
    }

    private void TryDispose(ExitCodeType exitCode, IDataLoadJob job)
    {
        try
        {
            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Disposing disposables..."));
            job.LoadCompletedSoDispose(exitCode, job);
            job.CloseLogging();
        }
        catch (Exception e)
        {
            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                $"Job {job.JobID} crashed again during disposing", e));
            throw;
        }
    }
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using System;
8	using System.Collections.Generic;
9	using Rdmp.Core.DataFlowPipeline;
10	using Rdmp.Core.DataLoad.Engine.Job;
11	using Rdmp.Core.DataLoad.Engine.LoadExecution.Components;
12	using Rdmp.Core.ReusableLibraryCode.Progress;
13
14	namespace Rdmp.Core.DataLoad.Engine.LoadExecution;
15
16	/// <summary>
17	/// Pipeline which processes a single job through all stages before accepting another. Execution involves running each DataLoadComponent with the current
18	/// IDataLoadJob and then disposing them.
19	/// </summary>
20	public class SingleJobExecution : IDataLoadExecution
21	{
22	public List<IDataLoadComponent> Components { get; set; }	92✔
23
24
25	public SingleJobExecution(List<IDataLoadComponent> components)	46✔
26	{
27	Components = components;	46✔
28	}	46✔
29
30	/// <summary>
31	///
32	/// </summary>
33	/// <returns></returns>
34	/// <exception cref="OperationCanceledException"></exception>
35	public ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
36	{
37	job.StartLogging();	46✔
38	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,	46✔
39	$"Starting load for {job.LoadMetadata.Name}"));	46✔
40
41	try
42	{
43	foreach (var component in Components)	356✔
44	{
45	cancellationToken.ThrowIfAbortRequested();	134✔
46
47	try
48	{
49	//schedule the component for disposal
50	job.PushForDisposal(component);	134✔
51
52	//run current component
53	var exitCodeType = component.Run(job, cancellationToken);	134✔
54
55	//current component failed so jump out, either because load not nessesary or crash
56	if (exitCodeType == ExitCodeType.OperationNotRequired)	132✔
57	{
58	TryDispose(exitCodeType, job);	2✔
59	//load not nessesary so abort entire DLE process but also cleanup still
60	return exitCodeType;	2✔
61	}
62
63	if (exitCodeType != ExitCodeType.Success)	130!
64	throw new Exception($"Component {component.Description} returned result {exitCodeType}");	×
65	}	130✔
66	catch (OperationCanceledException e)	×
67	{
68	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,	×
69	$"{component.Description} has been cancelled by the user", e));	×
70	throw;	×
71	}
72	catch (Exception e)	2✔
73	{
74	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,	2✔
75	$"{component.Description} crashed while running Job ", e));	2✔
76	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Job crashed", e));	×
77	TryDispose(ExitCodeType.Error, job);	×
78	return ExitCodeType.Error;	×
79	}
80	}
81
82	TryDispose(ExitCodeType.Success, job);	42✔
83
84	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Completed job {job.JobID}"));	42✔
85
86	if (job.CrashAtEndMessages.Count > 0)	42!
87	{
88	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,	×
89	$"There were {job.CrashAtEndMessages.Count} {nameof(IDataLoadJob.CrashAtEndMessages)} registered for job {job.JobID}"));	×
90
91	// pop the messages into the handler
92	foreach (var m in	×
93	job.CrashAtEndMessages)	×
94	job.OnNotify(job, m); // depending on the listener these may break flow of control (e.g.	×
95	// return failed (even if the messages are all warnings)
96	TryDispose(ExitCodeType.Error, job);	×
97	return ExitCodeType.Error;	×
98	}
99	//here
100	TryDispose(ExitCodeType.Success, job);	42✔
101	return ExitCodeType.Success;	42✔
102	}
103	catch (OperationCanceledException)	×
104	{
105	if (cancellationToken.IsAbortRequested)	×
106	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,	×
107	$"Job {job.JobID}cancelled in pipeline"));	×
108
109	TryDispose(cancellationToken.IsAbortRequested ? ExitCodeType.Abort : ExitCodeType.Success, job);	×
110	throw;	×
111	}
112	}	44✔
113
114	private void TryDispose(ExitCodeType exitCode, IDataLoadJob job)
115	{
116	try
117	{
118	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Disposing disposables..."));	86✔
119	job.LoadCompletedSoDispose(exitCode, job);	86✔
120	job.CloseLogging();	86✔
121	}	86✔
122	catch (Exception e)	×
123	{
124	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,	×
125	$"Job {job.JobID} crashed again during disposing", e));	×
126	throw;	×
127	}
128	}	86✔
129	}

HicServices / RDMP / 6245535001

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous