Revision 7a1ecaed daemons/ganeti-masterd
| b/daemons/ganeti-masterd | ||
|---|---|---|
| 166 | 166 |
if operation == "submit": |
| 167 | 167 |
return self.put(args) |
| 168 | 168 |
elif operation == "query": |
| 169 |
path = args["object"] |
|
| 170 |
if path == "instances": |
|
| 171 |
return self.query(args) |
|
| 169 |
return self.query(args) |
|
| 172 | 170 |
else: |
| 173 | 171 |
raise ValueError("Invalid operation")
|
| 174 | 172 |
|
| ... | ... | |
| 183 | 181 |
names = args["names"] |
| 184 | 182 |
if path == "instances": |
| 185 | 183 |
opclass = opcodes.OpQueryInstances |
| 184 |
elif path == "jobs": |
|
| 185 |
# early exit because job query-ing is special (not via opcodes) |
|
| 186 |
return self.query_jobs(fields, names) |
|
| 186 | 187 |
else: |
| 187 | 188 |
raise ValueError("Invalid object %s" % path)
|
| 188 | 189 |
|
| ... | ... | |
| 191 | 192 |
result = cpu.ExecOpCode(op) |
| 192 | 193 |
return result |
| 193 | 194 |
|
| 194 |
def query_job(self, rid): |
|
| 195 |
rid = int(data) |
|
| 196 |
job = self.server.queue.query(rid) |
|
| 197 |
return job |
|
| 195 |
def query_jobs(self, fields, names): |
|
| 196 |
return self.server.queue.query_jobs(fields, names) |
|
| 198 | 197 |
|
| 199 | 198 |
|
| 200 | 199 |
def JobRunner(proc, job): |
Also available in: Unified diff