Revision 09037780

b/NEWS
12 12 
- Replaced ``--disks`` option of ``gnt-instance replace-disks`` with a
13 13 
  more flexible ``--disk`` option. Now disk size and mode can be changed
14 14 
  upon recreation.
15 
- Removed deprecated ``QueryLocks`` LUXI request. Use
16 
  ``Query(what=QR_LOCK, ...)`` instead.
15 17 

  		





  16
  18
  
    

  		





  17
  19
  
    
Version 2.5.0 rc5


  		












  

    
      b/lib/luxi.py
    
  






  34
  34
  
    
import time


  		





  35
  35
  
    
import errno


  		





  36
  36
  
    
import logging


  		





  37
  
  
    
import warnings


  		





  38
  37
  
    

  		





  39
  38
  
    
from ganeti import serializer


  		





  40
  39
  
    
from ganeti import constants


  		





  ......




  65
  64
  
    
REQ_QUERY_CONFIG_VALUES = "QueryConfigValues"


  		





  66
  65
  
    
REQ_QUERY_CLUSTER_INFO = "QueryClusterInfo"


  		





  67
  66
  
    
REQ_QUERY_TAGS = "QueryTags"


  		





  68
  
  
    
REQ_QUERY_LOCKS = "QueryLocks"


  		





  69
  67
  
    
REQ_QUEUE_SET_DRAIN_FLAG = "SetDrainFlag"


  		





  70
  68
  
    
REQ_SET_WATCHER_PAUSE = "SetWatcherPause"


  		





  71
  69
  
    

  		





  ......




  551
  549
  
    

  		





  552
  550
  
    
  def QueryTags(self, kind, name):


  		





  553
  551
  
    
    return self.CallMethod(REQ_QUERY_TAGS, (kind, name))


  		





  554
  
  
    

  		





  555
  
  
    
  def QueryLocks(self, fields, sync):


  		





  556
  
  
    
    warnings.warn("This LUXI call is deprecated and will be removed, use"


  		





  557
  
  
    
                  " Query(\"%s\", ...) instead" % constants.QR_LOCK)


  		





  558
  
  
    
    return self.CallMethod(REQ_QUERY_LOCKS, (fields, sync))


  		












  

    
      b/lib/server/masterd.py
    
  






  393
  393
  
    
      op = opcodes.OpTagsGet(kind=kind, name=name)


  		





  394
  394
  
    
      return self._Query(op)


  		





  395
  395
  
    

  		





  396
  
  
    
    elif method == luxi.REQ_QUERY_LOCKS:


  		





  397
  
  
    
      (fields, sync) = args


  		





  398
  
  
    
      logging.info("Received locks query request")


  		





  399
  
  
    
      if sync:


  		





  400
  
  
    
        raise NotImplementedError("Synchronous queries are not implemented")


  		





  401
  
  
    
      return self.server.context.glm.OldStyleQueryLocks(fields)


  		





  402
  
  
    

  		





  403
  396
  
    
    elif method == luxi.REQ_QUEUE_SET_DRAIN_FLAG:


  		





  404
  397
  
    
      (drain_flag, ) = args


  		





  405
  398
  
    
      logging.info("Received queue drain flag change request to %s",


  		












Also available in:
  Unified diff