Revision eaf7d41d lib/cmdlib.py

b/lib/cmdlib.py
6860 6860 
    ("source_handshake", None, ht.TOr(ht.TList, ht.TNone)),
6861 6861 
    ("source_x509_ca", None, ht.TMaybeString),
6862 6862 
    ("source_instance_name", None, ht.TMaybeString),
6863 
    ("source_shutdown_timeout", constants.DEFAULT_SHUTDOWN_TIMEOUT,
6864 
     ht.TPositiveInt),
6863 6865 
    ("src_node", None, ht.TMaybeString),
6864 6866 
    ("src_path", None, ht.TMaybeString),
6865 6867 
    ("pnode", None, ht.TMaybeString),
......
7727 7729 

  		





  7728
  7730
  
    
      elif self.op.mode == constants.INSTANCE_REMOTE_IMPORT:


  		





  7729
  7731
  
    
        feedback_fn("* preparing remote import...")


  		





  7730
  
  
    
        connect_timeout = constants.RIE_CONNECT_TIMEOUT


  		





  
  7732
  
    
        # The source cluster will stop the instance before attempting to make a


  		





  
  7733
  
    
        # connection. In some cases stopping an instance can take a long time,


  		





  
  7734
  
    
        # hence the shutdown timeout is added to the connection timeout.


  		





  
  7735
  
    
        connect_timeout = (constants.RIE_CONNECT_TIMEOUT +


  		





  
  7736
  
    
                           self.op.source_shutdown_timeout)


  		





  7731
  7737
  
    
        timeouts = masterd.instance.ImportExportTimeouts(connect_timeout)


  		





  7732
  7738
  
    

  		





  7733
  7739
  
    
        disk_results = masterd.instance.RemoteImport(self, feedback_fn, iobj,


  		












Also available in:
  Unified diff