提交 bfba536e 编写于 作者: Y Yu Kun

Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk


Former-commit-id: b54e721af4274eb52d48fab5aaa734bbd5d26458
...@@ -9,6 +9,7 @@ container('milvus-build-env') { ...@@ -9,6 +9,7 @@ container('milvus-build-env') {
sh "git config --global user.email \"test@zilliz.com\"" sh "git config --global user.email \"test@zilliz.com\""
sh "git config --global user.name \"test\"" sh "git config --global user.name \"test\""
withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
sh "./build.sh -l"
sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -u -c" sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -u -c"
} }
} }
......
...@@ -9,6 +9,7 @@ container('milvus-build-env') { ...@@ -9,6 +9,7 @@ container('milvus-build-env') {
sh "git config --global user.email \"test@zilliz.com\"" sh "git config --global user.email \"test@zilliz.com\""
sh "git config --global user.name \"test\"" sh "git config --global user.name \"test\""
withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
sh "./build.sh -l"
sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j" sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j"
} }
} }
......
...@@ -44,7 +44,7 @@ metadata: ...@@ -44,7 +44,7 @@ metadata:
spec: spec:
containers: containers:
- name: milvus-build-env - name: milvus-build-env
image: registry.zilliz.com/milvus/milvus-build-env:v0.12 image: registry.zilliz.com/milvus/milvus-build-env:v0.13
command: command:
- cat - cat
tty: true tty: true
......
...@@ -44,7 +44,7 @@ metadata: ...@@ -44,7 +44,7 @@ metadata:
spec: spec:
containers: containers:
- name: milvus-build-env - name: milvus-build-env
image: registry.zilliz.com/milvus/milvus-build-env:v0.12 image: registry.zilliz.com/milvus/milvus-build-env:v0.13
command: command:
- cat - cat
tty: true tty: true
......
...@@ -44,7 +44,7 @@ metadata: ...@@ -44,7 +44,7 @@ metadata:
spec: spec:
containers: containers:
- name: milvus-build-env - name: milvus-build-env
image: registry.zilliz.com/milvus/milvus-build-env:v0.12 image: registry.zilliz.com/milvus/milvus-build-env:v0.13
command: command:
- cat - cat
tty: true tty: true
......
...@@ -18,16 +18,16 @@ ...@@ -18,16 +18,16 @@
#include "metrics/SystemInfo.h" #include "metrics/SystemInfo.h"
#include "utils/Log.h" #include "utils/Log.h"
#include <dirent.h>
#include <nvml.h> #include <nvml.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <utility> #include <utility>
#include<stdlib.h>
#include<dirent.h>
#include<stdio.h>
namespace milvus { namespace milvus {
namespace server { namespace server {
...@@ -64,7 +64,7 @@ SystemInfo::Init() { ...@@ -64,7 +64,7 @@ SystemInfo::Init() {
nvmlReturn_t nvmlresult; nvmlReturn_t nvmlresult;
nvmlresult = nvmlInit(); nvmlresult = nvmlInit();
if (NVML_SUCCESS != nvmlresult) { if (NVML_SUCCESS != nvmlresult) {
SERVER_LOG_ERROR << "System information initilization failed"; SERVER_LOG_ERROR << "System information initilization failed";
return; return;
} }
nvmlresult = nvmlDeviceGetCount(&num_device_); nvmlresult = nvmlDeviceGetCount(&num_device_);
...@@ -243,14 +243,14 @@ SystemInfo::CPUTemperature() { ...@@ -243,14 +243,14 @@ SystemInfo::CPUTemperature() {
std::vector<float> result; std::vector<float> result;
std::string path = "/sys/class/hwmon/"; std::string path = "/sys/class/hwmon/";
DIR *dir = NULL; DIR* dir = NULL;
dir = opendir(path.c_str()); dir = opendir(path.c_str());
if (!dir) { if (!dir) {
SERVER_LOG_ERROR << "Could not open hwmon directory"; SERVER_LOG_ERROR << "Could not open hwmon directory";
return result; return result;
} }
struct dirent *ptr = NULL; struct dirent* ptr = NULL;
while ((ptr = readdir(dir)) != NULL) { while ((ptr = readdir(dir)) != NULL) {
std::string filename(path); std::string filename(path);
filename.append(ptr->d_name); filename.append(ptr->d_name);
...@@ -261,7 +261,7 @@ SystemInfo::CPUTemperature() { ...@@ -261,7 +261,7 @@ SystemInfo::CPUTemperature() {
if (m.find("coretemp") != std::string::npos) { if (m.find("coretemp") != std::string::npos) {
std::string object = filename; std::string object = filename;
object += "/temp1_input"; object += "/temp1_input";
FILE *file = fopen(object.c_str(), "r"); FILE* file = fopen(object.c_str(), "r");
if (file == nullptr) { if (file == nullptr) {
SERVER_LOG_ERROR << "Could not open temperature file"; SERVER_LOG_ERROR << "Could not open temperature file";
return result; return result;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册