Skip to content
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.

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

Add classes LSFJobManager and SCARFLSFJobManager #503

Merged
merged 18 commits into from Apr 7, 2015

Conversation

FedeMPouzols
Copy link
Contributor

This addresses #11064.

This PR (see #398, #469) is about refactoring and putting the LSF and SCARF remote job manager code where it should be, ready for the remote algorithms revamp #11126. There is a sibling PR coming after this one for the Mantid API web service job manager #11392. The unit tests check the input/ouput/error handling/transaction logic with simple mocked server responses.

Note that I put these new classes in Framework/RemoteJobManagers. There are more coming but I wouldn't expect many. The amount of classes/files is not a reason to add RemoteJobManagers but I thought that it'd be better to keep distinct things in different places. Feedback on this is appreciated. They could also go with the RemoteAlgorithms on even API.

To test:

  • tests should pass
  • code review

@FedeMPouzols FedeMPouzols added the Framework Issues and pull requests related to components in the Framework label Apr 1, 2015
@FedeMPouzols FedeMPouzols added this to the Release 3.4 milestone Apr 1, 2015
…ger_and_SCARFLSFJobManager

Conflicts:
	Code/Mantid/Framework/CMakeLists.txt

Sort out conflict with removal of MDEvents, re #11064
@FedeMPouzols
Copy link
Contributor Author

Jenkins, be nice and retest this please

@FedeMPouzols
Copy link
Contributor Author

It seems that this is more or less fine, but we got a PoldiCreatePeaksFromFileTest failure on osx and a checkout issue on rhel7. Jenkins, retest this please

@FedeMPouzols
Copy link
Contributor Author

Jenkins, you can do it, retest this please

@mantid-roman mantid-roman self-assigned this Apr 2, 2015
Token(std::string &u, std::string &t) : m_url(u), m_token_str(t){};
std::string m_url;
std::string m_token_str;
};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the const qualifier missing before std::string&?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I'll fix it.

const std::string &body) const {
InternetHelper session;

std::string ContTypeName = "Content-Type";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to create a non-const variable?

const std::string &filename) {
// build file name as given in the request body
std::string upName = filename;
std::replace(upName.begin(), upName.end(), '\\', '/');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't Poco::Path be used here to avoid this sort of things?

@FedeMPouzols
Copy link
Contributor Author

I've pushed changes for many of your comments and some other improvements to the unit tests that Owen suggested in another PR. A few changes, including the Poco URI and Path points, are still missing. I'll let you know and remove the "in progress" label when this is finished.

@FedeMPouzols
Copy link
Contributor Author

I think this is ready again and the builds seem to be going well, so I've removed the "in progress" label.

mantid-roman added a commit that referenced this pull request Apr 7, 2015
…_SCARFLSFJobManager

Add classes LSFJobManager and SCARFLSFJobManager
@mantid-roman mantid-roman merged commit 280e7d0 into master Apr 7, 2015
@mantid-roman mantid-roman deleted the 11064_add_LSFJobManger_and_SCARFLSFJobManager branch April 7, 2015 07:59
FedeMPouzols added a commit that referenced this pull request Apr 7, 2015
…WebServiceAPIJobManage_from_RemoteAlgorithms_andRemoteJobManager

Conflicts:
	Code/Mantid/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
	Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h
	Code/Mantid/Framework/RemoteJobManagers/CMakeLists.txt

Sort out conflict in CMakeLists (files added in another PR, #503) and factory test, re #11392
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Framework Issues and pull requests related to components in the Framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants