Merge pull request #28184 from ClickHouse/trying_to_fix_fetches_test

Better detection of the default interface in replicated fetches tests
This commit is contained in:
alesapin 2021-09-01 12:21:50 +03:00 committed by GitHub
commit 68f6ecec62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -240,15 +240,27 @@ class _NetworkManager:
# Approximately mesure network I/O speed for interface # Approximately mesure network I/O speed for interface
class NetThroughput(object): class NetThroughput(object):
def __init__(self, node, interface="eth0"): def __init__(self, node):
self.interface = interface
self.node = node self.node = node
# trying to get default interface and check it in /proc/net/dev
self.interface = self.node.exec_in_container(["bash", "-c", "awk '{print $1 \" \" $2}' /proc/net/route | grep 00000000 | awk '{print $1}'"]).strip()
check = self.node.exec_in_container(["bash", "-c", f'grep "^ *{self.interface}:" /proc/net/dev']).strip()
if not check: # if check is not successful just try eth{1-10}
for i in range(10):
try:
self.interface = self.node.exec_in_container(["bash", "-c", f"awk '{{print $1}}' /proc/net/route | grep 'eth{i}'"]).strip()
break
except Exception as ex:
print(f"No interface eth{i}")
else:
raise Exception("No interface eth{1-10} and default interface not specified in /proc/net/route, maybe some special network configuration")
try: try:
check = subprocess.check_output(f'grep "^ *{self.interface}:" /proc/net/dev', shell=True) check = self.node.exec_in_container(["bash", "-c", f'grep "^ *{self.interface}:" /proc/net/dev']).strip()
if not check: if not check:
raise Exception(f"No such interface {self.interface} found in /proc/net/dev") raise Exception(f"No such interface {self.interface} found in /proc/net/dev")
except: except:
logging.error("All available interfaces %s", subprocess.check_output("cat /proc/net/dev", shell=True)) logging.error("All available interfaces %s", self.node.exec_in_container(["bash", "-c", "cat /proc/net/dev"]))
raise Exception(f"No such interface {self.interface} found in /proc/net/dev") raise Exception(f"No such interface {self.interface} found in /proc/net/dev")
self.current_in = self._get_in_bytes() self.current_in = self._get_in_bytes()