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.

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

Jump to bottom

DM-37836: bug fixes for ctrl_execute following initial testing #18

Merged
merged 1 commit into from
Feb 3, 2023
Merged

DM-37836: bug fixes for ctrl_execute following initial testing #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion bin.src/dagIdInfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
# extracts a line from a DAG file to show which ids were processed for a
# particular dag node
if __name__ == "__main__":

if len(sys.argv) != 3:
print("usage: %s dagNodeName filename" % os.path.basename(sys.argv[0]))
sys.exit(errno.EINVAL)
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ctrl/execute/allocatorParser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def parseArgs(self, basename):
action="store",
dest="dynamic",
type=str,
default=None,
default="__default__",
Copy link

Choose a reason for hiding this comment

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

No objections regarding changing the default value, but the command line help below is slightly misleading. Based on the current description I initially assumed that the --dynamicoption is a simple on/off flag, but looking at the code I see that one can actually use it to pass a custom template for configuring some aspects of the dynamic slot. So it would be nice if the help was reflecting that, something like:

a template file to use when configuring dynamic/partitionable slot

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For the "file input" for --dynamic, I will want to do some testing as I have not touched that for a while. Plus it ties together with offering memory control in Slurm, so I will do those together at some point, before advertising the feature more loudly.

help="configure to use dynamic/partitionable slot; legacy option: this is always enabled now",
)

Expand Down
1 change: 0 additions & 1 deletion python/lsst/ctrl/execute/qCommand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class QCommand:
"""A class which wraps qsub-style commands for execution"""

def __init__(self, platform):

# can handle both grid-proxy and ssh logins
self.remoteLoginCmd = "/usr/bin/gsissh"

Expand Down
1 change: 0 additions & 1 deletion python/lsst/ctrl/execute/slurmPlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

class SlurmPlugin(Allocator):
def submit(self, platform, platformPkgDir):

configName = os.path.join(platformPkgDir, "etc", "config", "slurmConfig.py")

self.loadSlurm(configName, platformPkgDir)
Expand Down
1 change: 0 additions & 1 deletion tests/test_allocationConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def setUp(self):
self.config = AllocationConfig()

def test_config1(self):

self.assertEqual(self.config.platform.queue, "debug")
self.assertIsNone(self.config.platform.email)
self.assertIsNone(self.config.platform.scratchDirectory)
Expand Down