From 3e591bd09e062cec0d26327bc2c5beb95af7d9c6 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 25 Jun 2019 22:31:04 -0400 Subject: [PATCH] Remove extra whitespaces on blank lines --- node-daemon/pvcd/CephInstance.py | 8 +++--- node-daemon/pvcd/DNSAggregatorInstance.py | 8 +++--- node-daemon/pvcd/Daemon.py | 4 +-- node-daemon/pvcd/DomainInstance.py | 30 ++++++++++---------- node-daemon/pvcd/NodeInstance.py | 12 ++++---- node-daemon/pvcd/VXNetworkInstance.py | 4 +-- node-daemon/pvcd/dnsmasq-zookeeper-leases.py | 2 +- node-daemon/pvcd/fencing.py | 2 +- node-daemon/pvcd/log.py | 6 ++-- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/node-daemon/pvcd/CephInstance.py b/node-daemon/pvcd/CephInstance.py index a0b029b4..296fded1 100644 --- a/node-daemon/pvcd/CephInstance.py +++ b/node-daemon/pvcd/CephInstance.py @@ -123,7 +123,7 @@ def add_osd(zk_conn, logger, node, device, weight): for line in stdout.split('\n'): if 'osd fsid' in line: osd_fsid = line.split()[-1] - + if not osd_fsid: print('ceph-volume lvm list') print('Could not find OSD fsid in data:') @@ -199,7 +199,7 @@ def remove_osd(zk_conn, logger, osd_id, osd_obj): if not osd_id in osd_list: logger.out('Could not find OSD {} in the cluster'.format(osd_id), state='e') return True - + # 1. Set the OSD out so it will flush logger.out('Setting out OSD disk with ID {}'.format(osd_id), state='i') retcode, stdout, stderr = common.run_os_command('ceph osd out {}'.format(osd_id)) @@ -208,7 +208,7 @@ def remove_osd(zk_conn, logger, osd_id, osd_obj): print(stdout) print(stderr) raise - + # 2. Wait for the OSD to flush logger.out('Flushing OSD disk with ID {}'.format(osd_id), state='i') osd_string = str() @@ -258,7 +258,7 @@ def remove_osd(zk_conn, logger, osd_id, osd_obj): print(stdout) print(stderr) raise - + # 6. Purge the OSD from Ceph logger.out('Purging OSD disk with ID {}'.format(osd_id), state='i') retcode, stdout, stderr = common.run_os_command('ceph osd purge {} --yes-i-really-mean-it'.format(osd_id)) diff --git a/node-daemon/pvcd/DNSAggregatorInstance.py b/node-daemon/pvcd/DNSAggregatorInstance.py index 681d8cbc..a1ba0576 100644 --- a/node-daemon/pvcd/DNSAggregatorInstance.py +++ b/node-daemon/pvcd/DNSAggregatorInstance.py @@ -135,7 +135,7 @@ class PowerDNSInstance(object): 'Successfully started PowerDNS zone aggregator', state='o' ) - + def stop(self): if self.dns_server_daemon: @@ -232,7 +232,7 @@ class DNSNetworkInstance(object): """, (domain_id, network_domain, ns_server, 'NS', 86400, 0) ) - + self.sql_conn.commit() self.sql_conn.close() self.sql_conn = None @@ -315,7 +315,7 @@ class AXFRDaemonInstance(object): self.config['pdns_postgresql_password'] ) ) - + # Start the thread self.thread.start() @@ -471,7 +471,7 @@ class AXFRDaemonInstance(object): # Commit all the previous changes self.sql_conn.commit() - + # Reload the domain common.run_os_command( '/usr/bin/pdns_control --socket-dir={} reload {}'.format( diff --git a/node-daemon/pvcd/Daemon.py b/node-daemon/pvcd/Daemon.py index 55fb732d..f2b23dfc 100644 --- a/node-daemon/pvcd/Daemon.py +++ b/node-daemon/pvcd/Daemon.py @@ -848,12 +848,12 @@ if enable_storage: @zk_conn.ChildrenWatch('/ceph/volumes/{}'.format(pool)) def update_volumes(new_volume_list): global volume_list, d_volume - + # Add any missing Volumes to the list for volume in new_volume_list: if not volume in volume_list[pool]: d_volume[pool][volume] = CephInstance.CephVolumeInstance(zk_conn, this_node, pool, volume) - + # Remove any deleted Volumes from the list for volume in volume_list[pool]: if not volume in new_volume_list: diff --git a/node-daemon/pvcd/DomainInstance.py b/node-daemon/pvcd/DomainInstance.py index 58bc505c..a6263348 100644 --- a/node-daemon/pvcd/DomainInstance.py +++ b/node-daemon/pvcd/DomainInstance.py @@ -141,7 +141,7 @@ class DomainInstance(object): self.logger.out('Failed to open local libvirt connection', state='e', prefix='Domain {}:'.format(self.domuuid)) self.instart = False return - + # Try to get the current state in case it's already running try: self.dom = self.lookupByUUID(self.domuuid) @@ -172,7 +172,7 @@ class DomainInstance(object): lv_conn.close() self.instart = False - + # Restart the VM def restart_vm(self): self.logger.out('Restarting VM', state='i', prefix='Domain {}:'.format(self.domuuid)) @@ -185,7 +185,7 @@ class DomainInstance(object): self.logger.out('Failed to open local libvirt connection', state='e', prefix='Domain {}:'.format(self.domuuid)) self.inrestart = False return - + self.shutdown_vm() time.sleep(0.2) self.start_vm() @@ -227,7 +227,7 @@ class DomainInstance(object): self.logger.out('Successfully stopped VM', state='o', prefix='Domain {}:'.format(self.domuuid)) self.dom = None self.instop = False - + # Stop the log watcher self.console_log_instance.stop() @@ -320,7 +320,7 @@ class DomainInstance(object): # Wait 1 second and increment the tick time.sleep(1) tick += 1 - + # Get zookeeper state and look for the VM in the local libvirt database self.state = zkhandler.readdata(self.zk_conn, '/domains/{}/state'.format(self.domuuid)) self.dom = self.lookupByUUID(self.domuuid) @@ -348,7 +348,7 @@ class DomainInstance(object): live_receive = False self.logger.out('Send failed on remote end', state='w', prefix='Domain {}:'.format(self.domuuid)) break - + # If we've already been waiting 90s for a receive # HARDCODE: 90s should be plenty of time for even extremely large VMs on reasonable networks if tick > 90: @@ -365,7 +365,7 @@ class DomainInstance(object): # Wait 1 second and increment the tick time.sleep(1) tick += 1 - + # Get zookeeper state and look for the VM in the local libvirt database self.state = zkhandler.readdata(self.zk_conn, '/domains/{}/state'.format(self.domuuid)) @@ -387,7 +387,7 @@ class DomainInstance(object): }) self.logger.out('Shutdown timed out without state change', state='e', prefix='Domain {}:'.format(self.domuuid)) break - + self.inreceive = False # @@ -474,7 +474,7 @@ class DomainInstance(object): self.removeDomainFromList() # Stop the log watcher self.console_log_instance.stop() - + else: # Conditional pass three - Is this VM currently running on this node if running == libvirt.VIR_DOMAIN_RUNNING: @@ -499,10 +499,10 @@ class DomainInstance(object): lv_conn = None libvirt_name = "qemu:///system" - + # Convert the text UUID to bytes buuid = uuid.UUID(tuuid).bytes - + # Try try: # Open a libvirt connection @@ -510,19 +510,19 @@ class DomainInstance(object): if lv_conn == None: self.logger.out('Failed to open local libvirt connection', state='e', prefix='Domain {}:'.format(self.domuuid)) return None - + # Lookup the UUID dom = lv_conn.lookupByUUID(buuid) - + # Fail except: dom = None - + # After everything finally: # Close the libvirt connection if lv_conn != None: lv_conn.close() - + # Return the dom object (or None) return dom diff --git a/node-daemon/pvcd/NodeInstance.py b/node-daemon/pvcd/NodeInstance.py index 9ff59dde..8d71e0f2 100644 --- a/node-daemon/pvcd/NodeInstance.py +++ b/node-daemon/pvcd/NodeInstance.py @@ -158,7 +158,7 @@ class NodeInstance(object): if data != self.memfree: self.memfree = data - + @self.zk_conn.DataWatch('/nodes/{}/memused'.format(self.name)) def watch_node_memused(data, stat, event=''): if event and event.type == 'DELETED': @@ -173,7 +173,7 @@ class NodeInstance(object): if data != self.memused: self.memused = data - + @self.zk_conn.DataWatch('/nodes/{}/memalloc'.format(self.name)) def watch_node_memalloc(data, stat, event=''): if event and event.type == 'DELETED': @@ -188,7 +188,7 @@ class NodeInstance(object): if data != self.memalloc: self.memalloc = data - + @self.zk_conn.DataWatch('/nodes/{}/vcpualloc'.format(self.name)) def watch_node_vcpualloc(data, stat, event=''): if event and event.type == 'DELETED': @@ -203,7 +203,7 @@ class NodeInstance(object): if data != self.vcpualloc: self.vcpualloc = data - + @self.zk_conn.DataWatch('/nodes/{}/runningdomains'.format(self.name)) def watch_node_runningdomains(data, stat, event=''): if event and event.type == 'DELETED': @@ -233,7 +233,7 @@ class NodeInstance(object): if data != self.domains_count: self.domains_count = data - + # Update value functions def update_node_list(self, d_node): self.d_node = d_node @@ -456,7 +456,7 @@ def getHypervisors(zk_conn, dom_uuid): valid_node_list.append(node) return valid_node_list - + # via free memory (relative to allocated memory) def findTargetHypervisorMem(zk_conn, dom_uuid): most_allocfree = 0 diff --git a/node-daemon/pvcd/VXNetworkInstance.py b/node-daemon/pvcd/VXNetworkInstance.py index 03445b53..d39a9ad8 100644 --- a/node-daemon/pvcd/VXNetworkInstance.py +++ b/node-daemon/pvcd/VXNetworkInstance.py @@ -380,12 +380,12 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out for acl in self.firewall_rules_out: order = zkhandler.readdata(self.zk_conn, '/networks/{}/firewall_rules/out/{}/order'.format(self.vni, acl)) ordered_acls_out[order] = acl - + for order in sorted(ordered_acls_in.keys()): sorted_acl_list['in'].append(ordered_acls_in[order]) for order in sorted(ordered_acls_out.keys()): sorted_acl_list['out'].append(ordered_acls_out[order]) - + for direction in 'in', 'out': for acl in sorted_acl_list[direction]: rule_prefix = "add rule inet filter vxlan{}-{} counter".format(self.vni, direction) diff --git a/node-daemon/pvcd/dnsmasq-zookeeper-leases.py b/node-daemon/pvcd/dnsmasq-zookeeper-leases.py index 96d55a78..0e0366c8 100755 --- a/node-daemon/pvcd/dnsmasq-zookeeper-leases.py +++ b/node-daemon/pvcd/dnsmasq-zookeeper-leases.py @@ -106,7 +106,7 @@ def read_lease_database(zk_conn, zk_leases_key): # Output list print('\n'.join(output_list)) - + def add_lease(zk_conn, zk_leases_key, expiry, macaddr, ipaddr, hostname, clientid): transaction = zk_conn.transaction() transaction.create('{}/{}'.format(zk_leases_key, macaddr), ''.encode('ascii')) diff --git a/node-daemon/pvcd/fencing.py b/node-daemon/pvcd/fencing.py index 4ee5bd90..27483493 100644 --- a/node-daemon/pvcd/fencing.py +++ b/node-daemon/pvcd/fencing.py @@ -63,7 +63,7 @@ def fenceNode(node_name, zk_conn, config, logger): zkhandler.writedata(zk_conn, { '/nodes/{}/routerstate'.format(node_name): 'secondary' }) if zkhandler.readdata(zk_conn, '/primary_node') == node_name: zkhandler.writedata(zk_conn, { '/primary_node': 'none' }) - + # If the fence succeeded and successful_fence is migrate if fence_status == True and config['successful_fence'] == 'migrate': migrateFromFencedNode(zk_conn, node_name, logger) diff --git a/node-daemon/pvcd/log.py b/node-daemon/pvcd/log.py index fc49402f..9e575deb 100644 --- a/node-daemon/pvcd/log.py +++ b/node-daemon/pvcd/log.py @@ -47,7 +47,7 @@ class Logger(object): self.last_colour = self.fmt_cyan else: self.last_colour = "" - + # Provide a hup function to close and reopen the writer def hup(self): self.writer.close() @@ -90,11 +90,11 @@ class Logger(object): date = '' colour = self.last_colour prompt = '>>> ' - + # Append space to prefix if prefix != '': prefix = prefix + ' - ' - + message = colour + prompt + endc + date + prefix + message print(message) if self.config['file_logging'] == 'True':