Browse Source

修改实现方式

master
lxbhahaha 10 months ago
parent
commit
a5631fe369
  1. 51
      app.py
  2. 7
      index.html

51
app.py

@ -37,6 +37,7 @@ def connect_server():
#endregion
def get_gpus_info(client, timeout):
try:
cmd = 'nvidia-smi --query-gpu=index,name,memory.total,memory.used,memory.free,utilization.gpu,utilization.memory,temperature.gpu --format=csv'
stdin, stdout, stderr = client.exec_command(cmd, timeout=timeout)
@ -79,10 +80,12 @@ def get_gpus_info(client, timeout):
})
return result
except Exception as e:
None
def get_storage_info(client, timeout, path_list):
try:
result = []
for target_path in path_list:
stdin, stdout, stderr = client.exec_command(f'df {target_path} | grep \'{target_path}\'', timeout=timeout)
output = stdout.read().decode()
@ -95,11 +98,12 @@ def get_storage_info(client, timeout, path_list):
"available": int(data[3])
}
result.append(tmp_res)
return result
except Exception as e:
return None
def get_memory_info(client, timeout):
try:
stdin, stdout, stderr = client.exec_command('free', timeout=timeout)
output = stdout.read().decode().split('\n')[1]
if output == "":
@ -111,6 +115,8 @@ def get_memory_info(client, timeout):
}
return result
except Exception as e:
return None
# 持续获取一个服务器的信息
def keep_check_one(server: dict, shared_data_list: dict, server_title: str, interval: float, re_connect_time: float=5):
@ -130,7 +136,7 @@ def keep_check_one(server: dict, shared_data_list: dict, server_title: str, inte
client.connect(server['ip'], port=server['port'], username=server['username'], password=server.get('password', None), key_filename=server.get('key_filename', None), timeout=interval*3)
cmd = 'nvidia-smi --query-gpu=index,name,memory.total,memory.used,memory.free,utilization.gpu,utilization.memory,temperature.gpu --format=csv'
shared_data_list[server_title]['err_info'] = ''
shared_data_list[server_title]['err_info'] = None
re_try_count = 0
# 循环检测
@ -141,17 +147,17 @@ def keep_check_one(server: dict, shared_data_list: dict, server_title: str, inte
gpu_info = get_gpus_info(client, interval*3)
# 存储空间信息
storage_info = get_storage_info(client, interval*3, server['storage_list'])
# 内存信息
memory_info = get_memory_info(client, interval*3)
# locked = False
# 记录信息
with data_list_lock:
# locked = True
shared_data_list[server_title]['gpu_info_list'] = gpu_info
shared_data_list[server_title]['storage_info_list'] = storage_info
shared_data_list[server_title]['memory_info'] = memory_info
shared_data_list[server_title]['updated'] = True
shared_data_list[server_title]['maxGPU'] = len(gpu_info)
# locked = False
except Exception as e:
keep_run = False
shared_data_list[server_title]['err_info'] = f'{e}'
@ -181,24 +187,27 @@ def filter_data(title_list: list):
if title not in data_dict:
server_data[title]['err_info'] = f'title \'{title}\' not exist!'
continue
# 还没获取到数据
gpu_info_list = data_dict[title].get('gpu_info_list', None)
if gpu_info_list is None:
err_info = data_dict[title].get('err_info', None)
if err_info is not None:
server_data[title]['err_info'] = data_dict[title]['err_info']
else:
server_data[title]['err_info'] = f'\'{title}\' still empty.'
continue
# 记录数据
# 记录数据 ----------------------------------------------------
data_updated = data_dict[title].get('updated', False)
err_info = data_dict[title].get('err_info', '')
server_data[title]['gpu_info_list'] = gpu_info_list
server_data[title]['storage_info_list'] = data_dict[title].get('storage_info_list', [])
server_data[title]['memory_info'] = data_dict[title].get('memory_info', {})
# 是否更新
server_data[title]['updated'] = data_updated
# 报错信息
err_info = data_dict[title].get('err_info', None)
if err_info is not None:
server_data[title]['err_info'] = err_info
# 显卡
gpu_info_list = data_dict[title].get('gpu_info_list', None)
if gpu_info_list is not None:
server_data[title]['gpu_info_list'] = gpu_info_list
# 硬盘
storage_info_list = data_dict[title].get('storage_info_list', None)
if storage_info_list is not None:
server_data[title]['storage_info_list'] = storage_info_list
# 内存
memory_info = data_dict[title].get('memory_info', None)
if memory_info is not None:
server_data[title]['memory_info'] = memory_info
result['time'] = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
result['server_data'] = server_data
return result

7
index.html

@ -174,7 +174,12 @@
+ 'Utilization: ' + gpu.util_gpu + '%';
serverCard.appendChild(gpuInfo);
});
}else{
}
if ('err_info' in serverData[key])
{
// 分割线
add_bar(serverCard);
let errInfo = document.createElement('div');
errInfo.classList.add('error-info');
errInfo.innerHTML = '<strong>error info</strong><br>' + serverData[key].err_info;

Loading…
Cancel
Save