Revision debac808 daemons/ganeti-masterd

b/daemons/ganeti-masterd
256 256
      (names, fields, use_locking) = args
257 257
      logging.info("Received instance query request for %s", names)
258 258
      if use_locking:
259
        raise errors.OpPrereqError("Sync queries are not allowed")
259
        raise errors.OpPrereqError("Sync queries are not allowed",
260
                                   errors.ECODE_INVAL)
260 261
      op = opcodes.OpQueryInstances(names=names, output_fields=fields,
261 262
                                    use_locking=use_locking)
262 263
      return self._Query(op)
......
265 266
      (names, fields, use_locking) = args
266 267
      logging.info("Received node query request for %s", names)
267 268
      if use_locking:
268
        raise errors.OpPrereqError("Sync queries are not allowed")
269
        raise errors.OpPrereqError("Sync queries are not allowed",
270
                                   errors.ECODE_INVAL)
269 271
      op = opcodes.OpQueryNodes(names=names, output_fields=fields,
270 272
                                use_locking=use_locking)
271 273
      return self._Query(op)
......
273 275
    elif method == luxi.REQ_QUERY_EXPORTS:
274 276
      nodes, use_locking = args
275 277
      if use_locking:
276
        raise errors.OpPrereqError("Sync queries are not allowed")
278
        raise errors.OpPrereqError("Sync queries are not allowed",
279
                                   errors.ECODE_INVAL)
277 280
      logging.info("Received exports query request")
278 281
      op = opcodes.OpQueryExports(nodes=nodes, use_locking=use_locking)
279 282
      return self._Query(op)

Also available in: Unified diff