|
15 | 15 |
|
16 | 16 |
|
17 | 17 | class HTCGatewayCluster(GatewayCluster): |
18 | | - def __init__(self, container_image=None, |
19 | | - memory: str = "32GB", |
20 | | - cpus: int = 4, |
21 | | - **kwargs): |
| 18 | + def __init__( |
| 19 | + self, container_image=None, memory: str = "32GB", cpus: int = 4, **kwargs |
| 20 | + ): |
22 | 21 | self.scheduler_proxy_ip = kwargs.pop("", "dask.software-dev.ncsa.illinois.edu") |
23 | 22 | self.batchWorkerJobs = [] |
24 | 23 | self.cluster_options = kwargs.get("cluster_options") |
@@ -100,7 +99,9 @@ def scale_batch_workers(self, n): |
100 | 99 | + """ htcdask-worker_$(Cluster)_$(Process) |
101 | 100 | output = condor/htcdask-worker$(Cluster)_$(Process).out |
102 | 101 | error = condor/htcdask-worker$(Cluster)_$(Process).err |
103 | | -log = condor/htcdask-worker$(Cluster)_$(Process).log"""+resources+""" |
| 102 | +log = condor/htcdask-worker$(Cluster)_$(Process).log""" |
| 103 | + + resources |
| 104 | + + """ |
104 | 105 | should_transfer_files = yes |
105 | 106 | transfer_input_files = ./dask-credentials, ./dask-worker-space , ./condor |
106 | 107 | when_to_transfer_output = ON_EXIT_OR_EVICT |
@@ -129,8 +130,8 @@ def scale_batch_workers(self, n): |
129 | 130 | --env DASK_GATEWAY_CLUSTER_NAME=$1 \ |
130 | 131 | --env DASK_GATEWAY_WORKER_NAME=$2 \ |
131 | 132 | --env DASK_GATEWAY_API_URL="https://dask.software-dev.ncsa.illinois.edu/api" """ |
132 | | - + self.container_image + |
133 | | - " dask worker --name $2 --tls-ca-file dask-credentials/dask.crt --tls-cert dask-credentials/dask.crt --tls-key dask-credentials/dask.pem --worker-port 10000:10070 --no-nanny --scheduler-sni daskgateway-" |
| 133 | + + self.container_image |
| 134 | + + " dask worker --name $2 --tls-ca-file dask-credentials/dask.crt --tls-cert dask-credentials/dask.crt --tls-key dask-credentials/dask.pem --worker-port 10000:10070 --no-nanny --scheduler-sni daskgateway-" |
134 | 135 | + cluster_name |
135 | 136 | + """ --nthreads 1 tls://""" |
136 | 137 | + self.scheduler_proxy_ip |
|
0 commit comments