From 691df6ed18f80cffd94e1fb7286b68c62a225861 Mon Sep 17 00:00:00 2001 From: kun yu Date: Sat, 27 Jul 2019 16:19:34 +0800 Subject: [PATCH 01/21] add CPU_usage_rate Metrics Former-commit-id: a2a914159d759f9724b70954758cd22d7d5c98ff --- cpp/src/metrics/MetricBase.h | 2 + cpp/src/metrics/PrometheusMetrics.cpp | 59 +++++++++++++++++++-------- cpp/src/metrics/PrometheusMetrics.h | 45 +++++++++++--------- cpp/src/metrics/SystemInfo.cpp | 58 +++++++++++++++++++++++++- cpp/src/metrics/SystemInfo.h | 5 +++ 5 files changed, 131 insertions(+), 38 deletions(-) diff --git a/cpp/src/metrics/MetricBase.h b/cpp/src/metrics/MetricBase.h index fe9b246503..61e9e7680f 100644 --- a/cpp/src/metrics/MetricBase.h +++ b/cpp/src/metrics/MetricBase.h @@ -64,6 +64,8 @@ class MetricsBase{ virtual void ConnectionGaugeDecrement() {}; virtual void KeepingAliveCounterIncrement(double value = 1) {}; virtual void OctetsSet() {}; + + virtual void CPUCoreUsagePercentSet() {}; }; diff --git a/cpp/src/metrics/PrometheusMetrics.cpp b/cpp/src/metrics/PrometheusMetrics.cpp index df0516344e..c8a09b8ea6 100644 --- a/cpp/src/metrics/PrometheusMetrics.cpp +++ b/cpp/src/metrics/PrometheusMetrics.cpp @@ -44,6 +44,8 @@ PrometheusMetrics::Init() { void PrometheusMetrics::CPUUsagePercentSet() { if(!startup_) return ; + int numProcessor = server::SystemInfo::GetInstance().num_processor(); + double usage_percent = server::SystemInfo::GetInstance().CPUPercent(); CPU_usage_percent_.Set(usage_percent); } @@ -60,14 +62,20 @@ PrometheusMetrics::GPUPercentGaugeSet() { if(!startup_) return; int numDevide = server::SystemInfo::GetInstance().num_device(); std::vector values = server::SystemInfo::GetInstance().GPUPercent(); - if(numDevide >= 1) GPU0_percent_gauge_.Set(static_cast(values[0])); - if(numDevide >= 2) GPU1_percent_gauge_.Set(static_cast(values[1])); - if(numDevide >= 3) GPU2_percent_gauge_.Set(static_cast(values[2])); - if(numDevide >= 4) GPU3_percent_gauge_.Set(static_cast(values[3])); - if(numDevide >= 5) GPU4_percent_gauge_.Set(static_cast(values[4])); - if(numDevide >= 6) GPU5_percent_gauge_.Set(static_cast(values[5])); - if(numDevide >= 7) GPU6_percent_gauge_.Set(static_cast(values[6])); - if(numDevide >= 8) GPU7_percent_gauge_.Set(static_cast(values[7])); + + for (int i = 0; i < values.size(); i++) { + prometheus::Gauge &GPU_percent = GPU_percent_.Add({{"DeviceNum", std::to_string(i)}}); + GPU_percent.Set(static_cast(values[i])); + } + +// if(numDevide >= 1) GPU0_percent_gauge_.Set(static_cast(values[0])); +// if(numDevide >= 2) GPU1_percent_gauge_.Set(static_cast(values[1])); +// if(numDevide >= 3) GPU2_percent_gauge_.Set(static_cast(values[2])); +// if(numDevide >= 4) GPU3_percent_gauge_.Set(static_cast(values[3])); +// if(numDevide >= 5) GPU4_percent_gauge_.Set(static_cast(values[4])); +// if(numDevide >= 6) GPU5_percent_gauge_.Set(static_cast(values[5])); +// if(numDevide >= 7) GPU6_percent_gauge_.Set(static_cast(values[6])); +// if(numDevide >= 8) GPU7_percent_gauge_.Set(static_cast(values[7])); // to do } @@ -78,16 +86,21 @@ void PrometheusMetrics::GPUMemoryUsageGaugeSet() { constexpr unsigned long long MtoB = 1024*1024; int numDevice = values.size(); - if(numDevice >=1) GPU0_memory_usage_gauge_.Set(values[0]/MtoB); - if(numDevice >=2) GPU1_memory_usage_gauge_.Set(values[1]/MtoB); - if(numDevice >=3) GPU2_memory_usage_gauge_.Set(values[2]/MtoB); - if(numDevice >=4) GPU3_memory_usage_gauge_.Set(values[3]/MtoB); - if(numDevice >=5) GPU4_memory_usage_gauge_.Set(values[4]/MtoB); - if(numDevice >=6) GPU5_memory_usage_gauge_.Set(values[5]/MtoB); - if(numDevice >=7) GPU6_memory_usage_gauge_.Set(values[6]/MtoB); - if(numDevice >=8) GPU7_memory_usage_gauge_.Set(values[7]/MtoB); + for (int i = 0; i < numDevice; i++) { + prometheus::Gauge &GPU_memory = GPU_memory_usage_.Add({{"DeviceNum", std::to_string(i)}}); + GPU_memory.Set(values[i] / MtoB); + } + + +// if(numDevice >=1) GPU0_memory_usage_gauge_.Set(values[0]/MtoB); +// if(numDevice >=2) GPU1_memory_usage_gauge_.Set(values[1]/MtoB); +// if(numDevice >=3) GPU2_memory_usage_gauge_.Set(values[2]/MtoB); +// if(numDevice >=4) GPU3_memory_usage_gauge_.Set(values[3]/MtoB); +// if(numDevice >=5) GPU4_memory_usage_gauge_.Set(values[4]/MtoB); +// if(numDevice >=6) GPU5_memory_usage_gauge_.Set(values[5]/MtoB); +// if(numDevice >=7) GPU6_memory_usage_gauge_.Set(values[6]/MtoB); +// if(numDevice >=8) GPU7_memory_usage_gauge_.Set(values[7]/MtoB); - // to do } void PrometheusMetrics::AddVectorsPerSecondGaugeSet(int num_vector, int dim, double time) { // MB/s @@ -140,6 +153,18 @@ void PrometheusMetrics::OctetsSet() { outoctets_gauge_.Set((in_and_out_octets.second-old_outoctets)/total_second); } +void PrometheusMetrics::CPUCoreUsagePercentSet() { + if (!startup_) + return; + + std::vector cpu_core_percent = server::SystemInfo::GetInstance().CPUCorePercent(); + + for (int i = 0; i < cpu_core_percent.size(); i++) { + prometheus::Gauge &core_percent = CPU_.Add({{"CPU", std::to_string(i)}}); + core_percent.Set(cpu_core_percent[i]); +// std::cout << cpu_core_percent[i] << "+"; + } +} } diff --git a/cpp/src/metrics/PrometheusMetrics.h b/cpp/src/metrics/PrometheusMetrics.h index 5b651ec14f..be73585310 100644 --- a/cpp/src/metrics/PrometheusMetrics.h +++ b/cpp/src/metrics/PrometheusMetrics.h @@ -12,6 +12,7 @@ #include #include +#include #include "server/ServerConfig.h" #include "MetricBase.h" @@ -78,6 +79,9 @@ class PrometheusMetrics: public MetricsBase { void QueryVectorResponseSummaryObserve(double value, int count = 1) override { if (startup_) for(int i = 0 ; i < count ; ++i) query_vector_response_summary_.Observe(value);}; void QueryVectorResponsePerSecondGaugeSet(double value) override {if (startup_) query_vector_response_per_second_gauge_.Set(value);}; void CPUUsagePercentSet() override ; + + void CPUCoreUsagePercentSet() override; + void RAMUsagePercentSet() override ; void QueryResponsePerSecondGaugeSet(double value) override {if(startup_) query_response_per_second_gauge.Set(value);}; void GPUPercentGaugeSet() override ; @@ -322,7 +326,7 @@ class PrometheusMetrics: public MetricsBase { prometheus::Gauge &faiss_disk_load_IO_speed_gauge_ = faiss_disk_load_IO_speed_.Add({{"DB","Faiss"}}); - ////all from CacheMgr.cpp + ////all from CacheMgr.cpp //record cache access count prometheus::Family &cache_access_ = prometheus::BuildCounter() .Name("cache_access_total") @@ -392,7 +396,9 @@ class PrometheusMetrics: public MetricsBase { .Name("CPU_usage_percent") .Help("CPU usage percent by this this process") .Register(*registry_); - prometheus::Gauge &CPU_usage_percent_ = CPU_.Add({}); + prometheus::Gauge &CPU_usage_percent_ = CPU_.Add({{"CPU", "0"}}); +// std::vector &CPU_usage_percent_array; + prometheus::Family &RAM_ = prometheus::BuildGauge() .Name("RAM_usage_percent") @@ -405,15 +411,14 @@ class PrometheusMetrics: public MetricsBase { .Name("Gpu_usage_percent") .Help("GPU_usage_percent ") .Register(*registry_); - prometheus::Gauge &GPU0_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "0"}}); - prometheus::Gauge &GPU1_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "1"}}); - prometheus::Gauge &GPU2_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "2"}}); - prometheus::Gauge &GPU3_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "3"}}); - prometheus::Gauge &GPU4_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "4"}}); - prometheus::Gauge &GPU5_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "5"}}); - prometheus::Gauge &GPU6_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "6"}}); - prometheus::Gauge &GPU7_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "7"}}); -// std::vector GPU_percent_gauges_; +// prometheus::Gauge &GPU0_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "0"}}); +// prometheus::Gauge &GPU1_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "1"}}); +// prometheus::Gauge &GPU2_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "2"}}); +// prometheus::Gauge &GPU3_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "3"}}); +// prometheus::Gauge &GPU4_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "4"}}); +// prometheus::Gauge &GPU5_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "5"}}); +// prometheus::Gauge &GPU6_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "6"}}); +// prometheus::Gauge &GPU7_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "7"}}); @@ -423,15 +428,15 @@ class PrometheusMetrics: public MetricsBase { .Name("GPU_memory_usage_total") .Help("GPU memory usage total ") .Register(*registry_); - prometheus::Gauge &GPU0_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "0"}}); - prometheus::Gauge &GPU1_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "1"}}); - prometheus::Gauge &GPU2_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "2"}}); - prometheus::Gauge &GPU3_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "3"}}); - prometheus::Gauge &GPU4_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "4"}}); - prometheus::Gauge &GPU5_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "5"}}); - prometheus::Gauge &GPU6_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "6"}}); - prometheus::Gauge &GPU7_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "7"}}); -// std::vector GPU_memory_usage_gauges_; +// prometheus::Gauge &GPU0_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "0"}}); +// prometheus::Gauge &GPU1_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "1"}}); +// prometheus::Gauge &GPU2_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "2"}}); +// prometheus::Gauge &GPU3_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "3"}}); +// prometheus::Gauge &GPU4_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "4"}}); +// prometheus::Gauge &GPU5_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "5"}}); +// prometheus::Gauge &GPU6_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "6"}}); +// prometheus::Gauge &GPU7_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "7"}}); + prometheus::Family &query_index_type_per_second_ = prometheus::BuildGauge() .Name("query_index_throughtout_per_microsecond") diff --git a/cpp/src/metrics/SystemInfo.cpp b/cpp/src/metrics/SystemInfo.cpp index a64cbc4992..9348b0d9c6 100644 --- a/cpp/src/metrics/SystemInfo.cpp +++ b/cpp/src/metrics/SystemInfo.cpp @@ -105,9 +105,65 @@ SystemInfo::GetProcessUsedMemory() { double SystemInfo::MemoryPercent() { if (!initialized_) Init(); - return GetProcessUsedMemory()*100/total_ram_; + return (double)(GetProcessUsedMemory()*100)/(double)total_ram_; } + + +std::vector +SystemInfo::CPUCorePercent() { + std::vector prev_work_time_array; + std::vector prev_total_time_array = getTotalCpuTime(prev_work_time_array); + usleep(100000); + std::vector cur_work_time_array; + std::vector cur_total_time_array = getTotalCpuTime(cur_work_time_array); + + std::vector cpu_core_percent; + for (int i = 0; i < num_processors_; i++) { + double total_cpu_time = cur_total_time_array[i] - prev_total_time_array[i]; + double cpu_work_time = cur_work_time_array[i] - prev_work_time_array[i]; + cpu_core_percent.push_back((cpu_work_time / total_cpu_time) * 100); + } + return cpu_core_percent; +} + +std::vector +SystemInfo::getTotalCpuTime(std::vector &work_time_array) +{ + std::vector total_time_array; + FILE* file = fopen("/proc/stat", "r"); + if (file == NULL) { + perror("Could not open stat file"); + return total_time_array; + } + + unsigned long long user = 0, nice = 0, system = 0, idle = 0; + unsigned long long iowait = 0, irq = 0, softirq = 0, steal = 0, guest = 0, guestnice = 0; + + for (int i = 0; i < num_processors_; i++) { + char buffer[1024]; + char* ret = fgets(buffer, sizeof(buffer) - 1, file); + if (ret == NULL) { + perror("Could not read stat file"); + fclose(file); + return total_time_array; + } + + sscanf(buffer, + "cpu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu", + &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest, &guestnice); + + work_time_array.push_back(user + nice + system); + total_time_array.push_back(user + nice + system + idle + iowait + irq + softirq + steal); + } + + fclose(file); + return total_time_array; +} + + + + double SystemInfo::CPUPercent() { if (!initialized_) Init(); diff --git a/cpp/src/metrics/SystemInfo.h b/cpp/src/metrics/SystemInfo.h index 2562e316e4..5ffb2c773f 100644 --- a/cpp/src/metrics/SystemInfo.h +++ b/cpp/src/metrics/SystemInfo.h @@ -46,6 +46,7 @@ class SystemInfo { } void Init(); + int num_processor() const { return num_processors_;}; int num_device() const {return num_device_;}; unsigned long long get_inoctets() { return in_octets_;}; unsigned long long get_octets() { return out_octets_;}; @@ -62,6 +63,10 @@ class SystemInfo { std::vector GPUPercent(); std::vector GPUMemoryUsed(); + std::vector CPUCorePercent(); + std::vector getTotalCpuTime(std::vector &workTime); + + }; } From 54a71a9fa07e884494bfda9bb3aba86a6187c771 Mon Sep 17 00:00:00 2001 From: kun yu Date: Sat, 27 Jul 2019 16:48:04 +0800 Subject: [PATCH 02/21] add CPU metrics Former-commit-id: bb2dffc5abb87340a58a4791a23e55858073531f --- cpp/src/db/DBImpl.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp index 9a27f09b3d..272c4ff598 100644 --- a/cpp/src/db/DBImpl.cpp +++ b/cpp/src/db/DBImpl.cpp @@ -312,6 +312,9 @@ void DBImpl::StartMetricTask() { server::Metrics::GetInstance().GPUMemoryUsageGaugeSet(); server::Metrics::GetInstance().OctetsSet(); + server::Metrics::GetInstance().CPUCoreUsagePercentSet(); + + ENGINE_LOG_TRACE << "Metric task finished"; } From af86fb92f3aa1629ab6a436c3b6db3dbfcf48506 Mon Sep 17 00:00:00 2001 From: kun yu Date: Thu, 1 Aug 2019 14:30:00 +0800 Subject: [PATCH 03/21] modify prometheus Former-commit-id: 95f2999b8627673954e16436ec07a890ba5cd22b --- cpp/src/metrics/PrometheusMetrics.cpp | 38 +++++++++------------------ cpp/src/metrics/PrometheusMetrics.h | 21 --------------- 2 files changed, 12 insertions(+), 47 deletions(-) diff --git a/cpp/src/metrics/PrometheusMetrics.cpp b/cpp/src/metrics/PrometheusMetrics.cpp index c8a09b8ea6..a730091a46 100644 --- a/cpp/src/metrics/PrometheusMetrics.cpp +++ b/cpp/src/metrics/PrometheusMetrics.cpp @@ -60,47 +60,34 @@ PrometheusMetrics::RAMUsagePercentSet() { void PrometheusMetrics::GPUPercentGaugeSet() { if(!startup_) return; - int numDevide = server::SystemInfo::GetInstance().num_device(); - std::vector values = server::SystemInfo::GetInstance().GPUPercent(); + int numDevice = server::SystemInfo::GetInstance().num_device(); +// std::vector values = server::SystemInfo::GetInstance().GPUPercent(); + std::vector used_memory = server::SystemInfo::GetInstance().GPUMemoryUsed(); + constexpr unsigned long long MtoB = 1024*1024; - for (int i = 0; i < values.size(); i++) { + + for (int i = 0; i < numDevice; i++) { prometheus::Gauge &GPU_percent = GPU_percent_.Add({{"DeviceNum", std::to_string(i)}}); - GPU_percent.Set(static_cast(values[i])); +// std::cout << "nvmlDeviceGetUtilizationRates: " << values[i] << std::endl; +// GPU_percent.Set(static_cast(values[i])); + double percent = (double)used_memory[i] / (double)MtoB; + double res = (percent / 6078) * 100; + GPU_percent.Set(res); } -// if(numDevide >= 1) GPU0_percent_gauge_.Set(static_cast(values[0])); -// if(numDevide >= 2) GPU1_percent_gauge_.Set(static_cast(values[1])); -// if(numDevide >= 3) GPU2_percent_gauge_.Set(static_cast(values[2])); -// if(numDevide >= 4) GPU3_percent_gauge_.Set(static_cast(values[3])); -// if(numDevide >= 5) GPU4_percent_gauge_.Set(static_cast(values[4])); -// if(numDevide >= 6) GPU5_percent_gauge_.Set(static_cast(values[5])); -// if(numDevide >= 7) GPU6_percent_gauge_.Set(static_cast(values[6])); -// if(numDevide >= 8) GPU7_percent_gauge_.Set(static_cast(values[7])); - - // to do } void PrometheusMetrics::GPUMemoryUsageGaugeSet() { if(!startup_) return; std::vector values = server::SystemInfo::GetInstance().GPUMemoryUsed(); constexpr unsigned long long MtoB = 1024*1024; - int numDevice = values.size(); + int numDevice = server::SystemInfo::GetInstance().num_device(); for (int i = 0; i < numDevice; i++) { prometheus::Gauge &GPU_memory = GPU_memory_usage_.Add({{"DeviceNum", std::to_string(i)}}); GPU_memory.Set(values[i] / MtoB); } - -// if(numDevice >=1) GPU0_memory_usage_gauge_.Set(values[0]/MtoB); -// if(numDevice >=2) GPU1_memory_usage_gauge_.Set(values[1]/MtoB); -// if(numDevice >=3) GPU2_memory_usage_gauge_.Set(values[2]/MtoB); -// if(numDevice >=4) GPU3_memory_usage_gauge_.Set(values[3]/MtoB); -// if(numDevice >=5) GPU4_memory_usage_gauge_.Set(values[4]/MtoB); -// if(numDevice >=6) GPU5_memory_usage_gauge_.Set(values[5]/MtoB); -// if(numDevice >=7) GPU6_memory_usage_gauge_.Set(values[6]/MtoB); -// if(numDevice >=8) GPU7_memory_usage_gauge_.Set(values[7]/MtoB); - } void PrometheusMetrics::AddVectorsPerSecondGaugeSet(int num_vector, int dim, double time) { // MB/s @@ -162,7 +149,6 @@ void PrometheusMetrics::CPUCoreUsagePercentSet() { for (int i = 0; i < cpu_core_percent.size(); i++) { prometheus::Gauge &core_percent = CPU_.Add({{"CPU", std::to_string(i)}}); core_percent.Set(cpu_core_percent[i]); -// std::cout << cpu_core_percent[i] << "+"; } } diff --git a/cpp/src/metrics/PrometheusMetrics.h b/cpp/src/metrics/PrometheusMetrics.h index be73585310..590130f444 100644 --- a/cpp/src/metrics/PrometheusMetrics.h +++ b/cpp/src/metrics/PrometheusMetrics.h @@ -397,7 +397,6 @@ class PrometheusMetrics: public MetricsBase { .Help("CPU usage percent by this this process") .Register(*registry_); prometheus::Gauge &CPU_usage_percent_ = CPU_.Add({{"CPU", "0"}}); -// std::vector &CPU_usage_percent_array; prometheus::Family &RAM_ = prometheus::BuildGauge() @@ -411,32 +410,12 @@ class PrometheusMetrics: public MetricsBase { .Name("Gpu_usage_percent") .Help("GPU_usage_percent ") .Register(*registry_); -// prometheus::Gauge &GPU0_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "0"}}); -// prometheus::Gauge &GPU1_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "1"}}); -// prometheus::Gauge &GPU2_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "2"}}); -// prometheus::Gauge &GPU3_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "3"}}); -// prometheus::Gauge &GPU4_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "4"}}); -// prometheus::Gauge &GPU5_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "5"}}); -// prometheus::Gauge &GPU6_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "6"}}); -// prometheus::Gauge &GPU7_percent_gauge_ = GPU_percent_.Add({{"DeviceNum", "7"}}); - - - //GPU Mempry used prometheus::Family &GPU_memory_usage_ = prometheus::BuildGauge() .Name("GPU_memory_usage_total") .Help("GPU memory usage total ") .Register(*registry_); -// prometheus::Gauge &GPU0_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "0"}}); -// prometheus::Gauge &GPU1_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "1"}}); -// prometheus::Gauge &GPU2_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "2"}}); -// prometheus::Gauge &GPU3_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "3"}}); -// prometheus::Gauge &GPU4_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "4"}}); -// prometheus::Gauge &GPU5_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "5"}}); -// prometheus::Gauge &GPU6_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "6"}}); -// prometheus::Gauge &GPU7_memory_usage_gauge_ = GPU_memory_usage_.Add({{"DeviceNum", "7"}}); - prometheus::Family &query_index_type_per_second_ = prometheus::BuildGauge() .Name("query_index_throughtout_per_microsecond") From 07de60005efa148746785a17e8acc5fa7df90cc3 Mon Sep 17 00:00:00 2001 From: kun yu Date: Thu, 1 Aug 2019 14:42:20 +0800 Subject: [PATCH 04/21] fix GPU Percent bug Former-commit-id: 0afa5d7a6a50c6a545c6fde296702580885d27b5 --- cpp/src/metrics/PrometheusMetrics.cpp | 10 +++------- cpp/src/metrics/SystemInfo.cpp | 12 ++++++------ cpp/src/metrics/SystemInfo.h | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/cpp/src/metrics/PrometheusMetrics.cpp b/cpp/src/metrics/PrometheusMetrics.cpp index a730091a46..3d83bff864 100644 --- a/cpp/src/metrics/PrometheusMetrics.cpp +++ b/cpp/src/metrics/PrometheusMetrics.cpp @@ -61,18 +61,14 @@ void PrometheusMetrics::GPUPercentGaugeSet() { if(!startup_) return; int numDevice = server::SystemInfo::GetInstance().num_device(); -// std::vector values = server::SystemInfo::GetInstance().GPUPercent(); + std::vector used_total = server::SystemInfo::GetInstance().GPUMemoryTotal(); std::vector used_memory = server::SystemInfo::GetInstance().GPUMemoryUsed(); - constexpr unsigned long long MtoB = 1024*1024; for (int i = 0; i < numDevice; i++) { prometheus::Gauge &GPU_percent = GPU_percent_.Add({{"DeviceNum", std::to_string(i)}}); -// std::cout << "nvmlDeviceGetUtilizationRates: " << values[i] << std::endl; -// GPU_percent.Set(static_cast(values[i])); - double percent = (double)used_memory[i] / (double)MtoB; - double res = (percent / 6078) * 100; - GPU_percent.Set(res); + double percent = (double)used_memory[i] / (double)used_total[i]; + GPU_percent.Set(percent * 100); } } diff --git a/cpp/src/metrics/SystemInfo.cpp b/cpp/src/metrics/SystemInfo.cpp index 9348b0d9c6..7628db78bb 100644 --- a/cpp/src/metrics/SystemInfo.cpp +++ b/cpp/src/metrics/SystemInfo.cpp @@ -192,17 +192,17 @@ SystemInfo::CPUPercent() { } -std::vector -SystemInfo::GPUPercent() { +std::vector +SystemInfo::GPUMemoryTotal() { // get GPU usage percent if(!initialized_) Init(); - std::vector result; - nvmlUtilization_t utilization; + std::vector result; + nvmlMemory_t nvmlMemory; for (int i = 0; i < num_device_; ++i) { nvmlDevice_t device; nvmlDeviceGetHandleByIndex(i, &device); - nvmlDeviceGetUtilizationRates(device, &utilization); - result.push_back(utilization.gpu); + nvmlDeviceGetMemoryInfo(device, &nvmlMemory); + result.push_back(nvmlMemory.total); } return result; } diff --git a/cpp/src/metrics/SystemInfo.h b/cpp/src/metrics/SystemInfo.h index 5ffb2c773f..629aaf7220 100644 --- a/cpp/src/metrics/SystemInfo.h +++ b/cpp/src/metrics/SystemInfo.h @@ -60,7 +60,7 @@ class SystemInfo { double MemoryPercent(); double CPUPercent(); std::pair Octets(); - std::vector GPUPercent(); + std::vector GPUMemoryTotal(); std::vector GPUMemoryUsed(); std::vector CPUCorePercent(); From 60f527c9c6209428b3040688c4b7af35495ddd6d Mon Sep 17 00:00:00 2001 From: starlord Date: Fri, 2 Aug 2019 19:14:03 +0800 Subject: [PATCH 05/21] MS-251 Build/Merge background thread error handling Former-commit-id: 31f019f55f7c0bb896ebc6a5905af9ed07143cfc --- cpp/src/db/DBImpl.cpp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp index af23543ccb..3eef4457d3 100644 --- a/cpp/src/db/DBImpl.cpp +++ b/cpp/src/db/DBImpl.cpp @@ -555,15 +555,25 @@ Status DBImpl::BuildIndex(const meta::TableFileSchema& file) { auto to_remove = file; to_remove.file_type_ = meta::TableFileSchema::TO_DELETE; - meta::TableFilesSchema update_files = {to_remove, table_file}; - meta_ptr_->UpdateTableFiles(update_files); + meta::TableFilesSchema update_files = {table_file, to_remove}; + status = meta_ptr_->UpdateTableFiles(update_files); + if(status.ok()) { + ENGINE_LOG_DEBUG << "New index file " << table_file.file_id_ << " of size " + << index->PhysicalSize() << " bytes" + << " from file " << to_remove.file_id_; - ENGINE_LOG_DEBUG << "New index file " << table_file.file_id_ << " of size " - << index->PhysicalSize() << " bytes" - << " from file " << to_remove.file_id_; + if(options_.insert_cache_immediately_) { + index->Cache(); + } + } else { + //failed to update meta, mark the new file as to_delete, don't delete old file + to_remove.file_type_ = meta::TableFileSchema::TO_INDEX; + status = meta_ptr_->UpdateTableFile(to_remove); + ENGINE_LOG_DEBUG << "Failed to update file to index, mark file: " << to_remove.file_id_ << " to to_index"; - if(options_.insert_cache_immediately_) { - index->Cache(); + table_file.file_type_ = meta::TableFileSchema::TO_DELETE; + status = meta_ptr_->UpdateTableFile(table_file); + ENGINE_LOG_DEBUG << "Failed to update file to index, mark file: " << table_file.file_id_ << " to to_delete"; } } catch (std::exception& ex) { From 0dc135c1d8fb4d81154732664bfb615a388fb97d Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 14:58:09 +0800 Subject: [PATCH 06/21] update arrow cache Former-commit-id: e5da81f23cee42d8acc8b7fa5efba36bd5aad312 --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index d176f5106b..37f612aaa5 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -478,10 +478,9 @@ macro(build_arrow) set(ARROW_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${ARROW_CACHE_PACKAGE_NAME}") set(ARROW_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${ARROW_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${ARROW_CACHE_URL} ${ARROW_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${ARROW_CACHE_URL} TO ${ARROW_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${ARROW_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check if remote file ${ARROW_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(arrow_ep GIT_REPOSITORY ${ARROW_SOURCE_URL} @@ -505,7 +504,12 @@ macro(build_arrow) ExternalProject_Create_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ARROW_CACHE_URL}) else() - ExternalProject_Use_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${ARROW_CACHE_URL} ${ARROW_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${ARROW_CACHE_URL} TO ${ARROW_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() message(FATAL_ERROR "The last commit ID of \"${ARROW_SOURCE_URL}\" repository don't match!") From 36c7a171dcf006815d52c244e6282f6f544931ef Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:04:48 +0800 Subject: [PATCH 07/21] update bzip2 & easylogging cache Former-commit-id: aa9a3ecebb7b90f56628178f8ea4b4f4025da694 --- cpp/cmake/ThirdPartyPackages.cmake | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 37f612aaa5..6971005741 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -479,7 +479,7 @@ macro(build_arrow) set(ARROW_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${ARROW_CACHE_PACKAGE_NAME}") execute_process(COMMAND wget -q --method HEAD ${ARROW_CACHE_URL} RESULT_VARIABLE return_code) - message(STATUS "Check if remote file ${ARROW_CACHE_URL}. return code = ${return_code}") + message(STATUS "Check the remote cache file ${ARROW_CACHE_URL}. return code = ${return_code}") if (NOT return_code EQUAL 0) externalproject_add(arrow_ep GIT_REPOSITORY @@ -677,10 +677,9 @@ macro(build_bzip2) set(BZIP2_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${BZIP2_CACHE_PACKAGE_NAME}") set(BZIP2_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${BZIP2_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${BZIP2_CACHE_URL} ${BZIP2_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${BZIP2_CACHE_URL} TO ${BZIP2_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${BZIP2_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote cache file ${BZIP2_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(bzip2_ep ${EP_LOG_OPTIONS} CONFIGURE_COMMAND @@ -705,7 +704,12 @@ macro(build_bzip2) ExternalProject_Create_Cache(bzip2_ep ${BZIP2_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/bzip2_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${BZIP2_CACHE_URL}) else() - ExternalProject_Use_Cache(bzip2_ep ${BZIP2_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${BZIP2_CACHE_URL} ${BZIP2_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${BZIP2_CACHE_URL} TO ${BZIP2_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(bzip2_ep ${BZIP2_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(bzip2_ep @@ -825,10 +829,9 @@ macro(build_easyloggingpp) set(EASYLOGGINGPP_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${EASYLOGGINGPP_CACHE_PACKAGE_NAME}") set(EASYLOGGINGPP_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${EASYLOGGINGPP_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${EASYLOGGINGPP_CACHE_URL} ${EASYLOGGINGPP_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${EASYLOGGINGPP_CACHE_URL} TO ${EASYLOGGINGPP_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${EASYLOGGINGPP_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote cache file ${EASYLOGGINGPP_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(easyloggingpp_ep URL ${EASYLOGGINGPP_SOURCE_URL} @@ -843,7 +846,12 @@ macro(build_easyloggingpp) ExternalProject_Create_Cache(easyloggingpp_ep ${EASYLOGGINGPP_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/easyloggingpp_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${EASYLOGGINGPP_CACHE_URL}) else() - ExternalProject_Use_Cache(easyloggingpp_ep ${EASYLOGGINGPP_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${EASYLOGGINGPP_CACHE_URL} ${EASYLOGGINGPP_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${EASYLOGGINGPP_CACHE_URL} TO ${EASYLOGGINGPP_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(easyloggingpp_ep ${EASYLOGGINGPP_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(easyloggingpp_ep From 4596279dfab6fff5d32b32d7665dad5d9b5c2181 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:08:44 +0800 Subject: [PATCH 08/21] update openblas cache Former-commit-id: c318b906d63dfcbd58e867f0a244e0e33ba4dedc --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 6971005741..70f94112a9 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -900,10 +900,9 @@ macro(build_openblas) set(OPENBLAS_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${OPENBLAS_CACHE_PACKAGE_NAME}") set(OPENBLAS_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${OPENBLAS_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${OPENBLAS_CACHE_URL} ${OPENBLAS_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${OPENBLAS_CACHE_URL} TO ${OPENBLAS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${OPENBLAS_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${OPENBLAS_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(openblas_ep URL ${OPENBLAS_SOURCE_URL} @@ -924,7 +923,12 @@ macro(build_openblas) ExternalProject_Create_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/openblas_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${OPENBLAS_CACHE_URL}) else() - ExternalProject_Use_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${OPENBLAS_CACHE_URL} ${OPENBLAS_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${OPENBLAS_CACHE_URL} TO ${OPENBLAS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(openblas_ep From 1333eb14b4029c32ae53a81199c0110339891e75 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:10:52 +0800 Subject: [PATCH 09/21] update lapack cache Former-commit-id: 5074d349281f913742b88d44977113367e580b4b --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 70f94112a9..e3d186015e 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -980,10 +980,9 @@ macro(build_lapack) set(LAPACK_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${LAPACK_CACHE_PACKAGE_NAME}") set(LAPACK_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${LAPACK_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${LAPACK_CACHE_URL} ${LAPACK_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${LAPACK_CACHE_URL} TO ${LAPACK_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${LAPACK_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${LAPACK_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(lapack_ep URL ${LAPACK_SOURCE_URL} @@ -998,7 +997,12 @@ macro(build_lapack) ExternalProject_Create_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/lapack_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${LAPACK_CACHE_URL}) else() - ExternalProject_Use_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${LAPACK_CACHE_URL} ${LAPACK_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${LAPACK_CACHE_URL} TO ${LAPACK_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(lapack_ep From bc6d8eedd73189b7a9c92e0ae79b7a2c7b973857 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:15:08 +0800 Subject: [PATCH 10/21] update faiss & lz4 cache Former-commit-id: 9c51a209d30846249ed6dfd13cf1f770332b5f05 --- cpp/cmake/ThirdPartyPackages.cmake | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index e3d186015e..4b9cb03b3a 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -1096,10 +1096,9 @@ macro(build_faiss) set(FAISS_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${FAISS_CACHE_PACKAGE_NAME}") set(FAISS_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${FAISS_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${FAISS_CACHE_URL} ${FAISS_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${FAISS_CACHE_URL} TO ${FAISS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${FAISS_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${FAISS_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(faiss_ep URL ${FAISS_SOURCE_URL} @@ -1122,7 +1121,12 @@ macro(build_faiss) ExternalProject_Create_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/faiss_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${FAISS_CACHE_URL}) else() - ExternalProject_Use_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${FAISS_CACHE_URL} ${FAISS_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${FAISS_CACHE_URL} TO ${FAISS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(faiss_ep @@ -1350,10 +1354,9 @@ macro(build_lz4) set(LZ4_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${LZ4_CACHE_PACKAGE_NAME}") set(LZ4_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${LZ4_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${LZ4_CACHE_URL} ${LZ4_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${LZ4_CACHE_URL} TO ${LZ4_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${LZ4_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${LZ4_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(lz4_ep URL ${LZ4_SOURCE_URL} @@ -1377,7 +1380,12 @@ macro(build_lz4) ExternalProject_Create_Cache(lz4_ep ${LZ4_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/lz4_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${LZ4_CACHE_URL}) else() - ExternalProject_Use_Cache(lz4_ep ${LZ4_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${LZ4_CACHE_URL} ${LZ4_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${LZ4_CACHE_URL} TO ${LZ4_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(lz4_ep ${LZ4_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(lz4_ep From 735e14b218fe5251a838375ce524dcffc8b6579b Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:16:57 +0800 Subject: [PATCH 11/21] update mysqlcpp cache Former-commit-id: a98382caf3b3f5ae7a96e84277d2457ba0fd67f0 --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 4b9cb03b3a..cba252f3f5 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -1448,10 +1448,9 @@ macro(build_mysqlpp) set(MYSQLPP_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${MYSQLPP_CACHE_PACKAGE_NAME}") set(MYSQLPP_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${MYSQLPP_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${MYSQLPP_CACHE_URL} ${MYSQLPP_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${MYSQLPP_CACHE_URL} TO ${MYSQLPP_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${MYSQLPP_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${MYSQLPP_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(mysqlpp_ep URL ${MYSQLPP_SOURCE_URL} @@ -1468,7 +1467,12 @@ macro(build_mysqlpp) ExternalProject_Create_Cache(mysqlpp_ep ${MYSQLPP_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/mysqlpp_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${MYSQLPP_CACHE_URL}) else() - ExternalProject_Use_Cache(mysqlpp_ep ${MYSQLPP_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${MYSQLPP_CACHE_URL} ${MYSQLPP_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${MYSQLPP_CACHE_URL} TO ${MYSQLPP_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(mysqlpp_ep ${MYSQLPP_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(mysqlpp_ep From 00ebbec591bdd592f8244583ac5a0f130c9b3a48 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:18:13 +0800 Subject: [PATCH 12/21] update prometheus cache Former-commit-id: 40fa4e1cc250f3830ab98a1baafeb9ad99f441c0 --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index cba252f3f5..891ee91a3a 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -1542,10 +1542,9 @@ macro(build_prometheus) set(PROMETHEUS_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${PROMETHEUS_CACHE_PACKAGE_NAME}") set(PROMETHEUS_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${PROMETHEUS_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${PROMETHEUS_CACHE_URL} ${PROMETHEUS_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${PROMETHEUS_CACHE_URL} TO ${PROMETHEUS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${PROMETHEUS_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${PROMETHEUS_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(prometheus_ep GIT_REPOSITORY ${PROMETHEUS_SOURCE_URL} @@ -1572,7 +1571,12 @@ macro(build_prometheus) ExternalProject_Create_Cache(prometheus_ep ${PROMETHEUS_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/prometheus_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${PROMETHEUS_CACHE_URL}) else() - ExternalProject_Use_Cache(prometheus_ep ${PROMETHEUS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${PROMETHEUS_CACHE_URL} ${PROMETHEUS_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${PROMETHEUS_CACHE_URL} TO ${PROMETHEUS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(prometheus_ep ${PROMETHEUS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() message(FATAL_ERROR "The last commit ID of \"${PROMETHEUS_SOURCE_URL}\" repository don't match!") From b8d4d7435339211036257005f4d1e7b906f65016 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:26:24 +0800 Subject: [PATCH 13/21] add rocksdb cache Former-commit-id: 6fef8a6efa281bb65f6effdc6fedd7218de73642 --- cpp/cmake/ThirdPartyPackages.cmake | 79 +++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 19 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 891ee91a3a..728a6fa31a 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -373,6 +373,7 @@ else () set(ROCKSDB_SOURCE_URL "https://github.com/facebook/rocksdb/archive/${ROCKSDB_VERSION}.tar.gz") endif() +set(ROCKSDB_MD5 "a8f2f594182e97a08629bcc66dfd3fa0") if(DEFINED ENV{MILVUS_SNAPPY_URL}) set(SNAPPY_SOURCE_URL "$ENV{MILVUS_SNAPPY_URL}") @@ -1656,25 +1657,65 @@ macro(build_rocksdb) "${ROCKSDB_PREFIX}/lib/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${ROCKSDB_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}" ) - externalproject_add(rocksdb_ep - URL - ${ROCKSDB_SOURCE_URL} - ${EP_LOG_OPTIONS} - CONFIGURE_COMMAND - "" - BUILD_COMMAND - ${MAKE} - ${MAKE_BUILD_ARGS} - static_lib - "prefix=${ROCKSDB_PREFIX}" - BUILD_IN_SOURCE - 1 - INSTALL_COMMAND - ${MAKE} - install-static - "INSTALL_PATH=${ROCKSDB_PREFIX}/lib" - BUILD_BYPRODUCTS - "${ROCKSDB_STATIC_LIB}") + if(USE_JFROG_CACHE STREQUAL "ON") + string(MD5 ROCKSDB_COMBINE_MD5 "${ROCKSDB_LAST_COMMIT_ID}") + set(ROCKSDB_CACHE_PACKAGE_NAME "rocksdb_${ROCKSDB_MD5}.tar.gz") + set(ROCKSDB_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${ROCKSDB_CACHE_PACKAGE_NAME}") + set(ROCKSDB_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${ROCKSDB_CACHE_PACKAGE_NAME}") + + execute_process(COMMAND wget -q --method HEAD ${ROCKSDB_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${ROCKSDB_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) + externalproject_add(rocksdb_ep + URL + ${ROCKSDB_SOURCE_URL} + ${EP_LOG_OPTIONS} + CONFIGURE_COMMAND + "" + BUILD_COMMAND + ${MAKE} + ${MAKE_BUILD_ARGS} + static_lib + "prefix=${ROCKSDB_PREFIX}" + BUILD_IN_SOURCE + 1 + INSTALL_COMMAND + ${MAKE} + install-static + "INSTALL_PATH=${ROCKSDB_PREFIX}/lib" + BUILD_BYPRODUCTS + "${ROCKSDB_STATIC_LIB}") + + ExternalProject_Create_Cache(rocksdb_ep ${ROCKSDB_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/rocksdb_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ROCKSDB_CACHE_URL}) + else() + file(DOWNLOAD ${ROCKSDB_CACHE_URL} ${ROCKSDB_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${ROCKSDB_CACHE_URL} TO ${ROCKSDB_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(rocksdb_ep ${ROCKSDB_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() + endif() + else() + externalproject_add(rocksdb_ep + URL + ${ROCKSDB_SOURCE_URL} + ${EP_LOG_OPTIONS} + CONFIGURE_COMMAND + "" + BUILD_COMMAND + ${MAKE} + ${MAKE_BUILD_ARGS} + static_lib + "prefix=${ROCKSDB_PREFIX}" + BUILD_IN_SOURCE + 1 + INSTALL_COMMAND + ${MAKE} + install-static + "INSTALL_PATH=${ROCKSDB_PREFIX}/lib" + BUILD_BYPRODUCTS + "${ROCKSDB_STATIC_LIB}") + endif() file(MAKE_DIRECTORY "${ROCKSDB_PREFIX}/include") From b1208cb4d5c2c90d485667a66ddd53f1c134c302 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:41:16 +0800 Subject: [PATCH 14/21] add snappy cache Former-commit-id: 1e598b7d393b48328910f7d4d340547067bd1058 --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 728a6fa31a..6fb739625e 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -1757,10 +1757,9 @@ macro(build_snappy) set(SNAPPY_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${SNAPPY_CACHE_PACKAGE_NAME}") set(SNAPPY_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${SNAPPY_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${SNAPPY_CACHE_URL} ${SNAPPY_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${SNAPPY_CACHE_URL} TO ${SNAPPY_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${SNAPPY_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${SNAPPY_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(snappy_ep ${EP_LOG_OPTIONS} BUILD_COMMAND @@ -1779,7 +1778,12 @@ macro(build_snappy) ExternalProject_Create_Cache(snappy_ep ${SNAPPY_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/snappy_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${SNAPPY_CACHE_URL}) else() - ExternalProject_Use_Cache(snappy_ep ${SNAPPY_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${SNAPPY_CACHE_URL} ${SNAPPY_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${SNAPPY_CACHE_URL} TO ${SNAPPY_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(snappy_ep ${SNAPPY_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(snappy_ep From 5a8b44bb8ccf4a6328c5d2076fb4347b6925b216 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:43:06 +0800 Subject: [PATCH 15/21] add sqlite cache Former-commit-id: 86d3ad2f14dd56ec6453af73682a7d322c77fa7d --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 6fb739625e..cc958e4de9 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -1843,10 +1843,9 @@ macro(build_sqlite) set(SQLITE_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${SQLITE_CACHE_PACKAGE_NAME}") set(SQLITE_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${SQLITE_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${SQLITE_CACHE_URL} ${SQLITE_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${SQLITE_CACHE_URL} TO ${SQLITE_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${SQLITE_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${SQLITE_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(sqlite_ep URL ${SQLITE_SOURCE_URL} @@ -1864,7 +1863,12 @@ macro(build_sqlite) ExternalProject_Create_Cache(sqlite_ep ${SQLITE_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/sqlite_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${SQLITE_CACHE_URL}) else() - ExternalProject_Use_Cache(sqlite_ep ${SQLITE_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${SQLITE_CACHE_URL} ${SQLITE_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${SQLITE_CACHE_URL} TO ${SQLITE_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(sqlite_ep ${SQLITE_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(sqlite_ep From 0d1914d68996969625028a119d0061e8de2225ee Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:45:12 +0800 Subject: [PATCH 16/21] add thrift cache Former-commit-id: 1a0ffac2e4c3b5a1d46a78cbf42918ab7a16cd2c --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index cc958e4de9..86557f251a 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -1982,10 +1982,9 @@ macro(build_thrift) set(THRIFT_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${THRIFT_CACHE_PACKAGE_NAME}") set(THRIFT_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${THRIFT_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${THRIFT_CACHE_URL} ${THRIFT_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${THRIFT_CACHE_URL} TO ${THRIFT_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${THRIFT_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${THRIFT_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(thrift_ep URL ${THRIFT_SOURCE_URL} @@ -2005,7 +2004,12 @@ macro(build_thrift) ExternalProject_Create_Cache(thrift_ep ${THRIFT_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/thrift_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${THRIFT_CACHE_URL}) else() - ExternalProject_Use_Cache(thrift_ep ${THRIFT_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${THRIFT_CACHE_URL} ${THRIFT_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${THRIFT_CACHE_URL} TO ${THRIFT_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(thrift_ep ${THRIFT_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(thrift_ep From fdc8d5f3d8e1bcd582e8f3cf96d9d1ff339fcff7 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:47:32 +0800 Subject: [PATCH 17/21] add yamlcpp cache Former-commit-id: 233e0287b04387cb2515ef863b43aeea7436cf19 --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 86557f251a..d5384e2f47 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -2069,10 +2069,9 @@ macro(build_yamlcpp) set(YAMLCPP_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${YAMLCPP_CACHE_PACKAGE_NAME}") set(YAMLCPP_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${YAMLCPP_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${YAMLCPP_CACHE_URL} ${YAMLCPP_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${YAMLCPP_CACHE_URL} TO ${YAMLCPP_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${YAMLCPP_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${YAMLCPP_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(yaml-cpp_ep URL ${YAMLCPP_SOURCE_URL} @@ -2087,7 +2086,12 @@ macro(build_yamlcpp) ExternalProject_Create_Cache(yaml-cpp_ep ${YAMLCPP_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/yaml-cpp_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${YAMLCPP_CACHE_URL}) else() - ExternalProject_Use_Cache(yaml-cpp_ep ${YAMLCPP_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${YAMLCPP_CACHE_URL} ${YAMLCPP_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${YAMLCPP_CACHE_URL} TO ${YAMLCPP_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(yaml-cpp_ep ${YAMLCPP_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(yaml-cpp_ep From a672278435666e0cdf31e26ece44cb91ddaf709d Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:49:16 +0800 Subject: [PATCH 18/21] add zlib cache Former-commit-id: a9c217272ea23ea7add1db2941664fce5532e82e --- cpp/cmake/ThirdPartyPackages.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index d5384e2f47..695bd1c3d5 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -2141,10 +2141,9 @@ macro(build_zlib) set(ZLIB_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${ZLIB_CACHE_PACKAGE_NAME}") set(ZLIB_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${ZLIB_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${ZLIB_CACHE_URL} ${ZLIB_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${ZLIB_CACHE_URL} TO ${ZLIB_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${ZLIB_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${ZLIB_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(zlib_ep URL ${ZLIB_SOURCE_URL} @@ -2159,7 +2158,12 @@ macro(build_zlib) ExternalProject_Create_Cache(zlib_ep ${ZLIB_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/zlib_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ZLIB_CACHE_URL}) else() - ExternalProject_Use_Cache(zlib_ep ${ZLIB_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${ZLIB_CACHE_URL} ${ZLIB_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${ZLIB_CACHE_URL} TO ${ZLIB_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(zlib_ep ${ZLIB_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(zlib_ep From 3b23209c25dfc9923ae892e121146b624674d6a2 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 15:53:52 +0800 Subject: [PATCH 19/21] add zstd & aws cache Former-commit-id: 8d509b788389631ef8d5ab8504393dabf1186ae0 --- cpp/cmake/ThirdPartyPackages.cmake | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 695bd1c3d5..71a1cfd6b5 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -2231,10 +2231,9 @@ macro(build_zstd) set(ZSTD_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${ZSTD_CACHE_PACKAGE_NAME}") set(ZSTD_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${ZSTD_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${ZSTD_CACHE_URL} ${ZSTD_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${ZSTD_CACHE_URL} TO ${ZSTD_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${ZSTD_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${ZSTD_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(zstd_ep ${EP_LOG_OPTIONS} CMAKE_ARGS @@ -2253,7 +2252,12 @@ macro(build_zstd) ExternalProject_Create_Cache(zstd_ep ${ZSTD_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/zstd_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ZSTD_CACHE_URL}) else() - ExternalProject_Use_Cache(zstd_ep ${ZSTD_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${ZSTD_CACHE_URL} ${ZSTD_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${ZSTD_CACHE_URL} TO ${ZSTD_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(zstd_ep ${ZSTD_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(zstd_ep @@ -2324,10 +2328,9 @@ macro(build_aws) set(AWS_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${AWS_CACHE_PACKAGE_NAME}") set(AWS_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${AWS_CACHE_PACKAGE_NAME}") - file(DOWNLOAD ${AWS_CACHE_URL} ${AWS_CACHE_PACKAGE_PATH} STATUS status) - list(GET status 0 status_code) - message(STATUS "DOWNLOADING FROM ${AWS_CACHE_URL} TO ${AWS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") - if (NOT status_code EQUAL 0) + execute_process(COMMAND wget -q --method HEAD ${AWS_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${AWS_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) externalproject_add(aws_ep ${EP_LOG_OPTIONS} CMAKE_ARGS @@ -2345,7 +2348,12 @@ macro(build_aws) ExternalProject_Create_Cache(aws_ep ${AWS_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/aws_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${AWS_CACHE_URL}) else() - ExternalProject_Use_Cache(aws_ep ${AWS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + file(DOWNLOAD ${AWS_CACHE_URL} ${AWS_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${AWS_CACHE_URL} TO ${AWS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(aws_ep ${AWS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() else() externalproject_add(aws_ep From 5a841e9ff7e443a3258d5b33f6d66929df44c613 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 16:00:32 +0800 Subject: [PATCH 20/21] add libunwind cache Former-commit-id: 12f0d46ccf26775f717f93cd42c9b3efdbe73876 --- cpp/cmake/ThirdPartyPackages.cmake | 66 +++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 71a1cfd6b5..fc76ab714d 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -441,6 +441,7 @@ else() set(LIBUNWIND_SOURCE_URL "https://github.com/libunwind/libunwind/releases/download/v${LIBUNWIND_VERSION}/libunwind-${LIBUNWIND_VERSION}.tar.gz") endif() +set(LIBUNWIND_MD5 "a04f69d66d8e16f8bf3ab72a69112cd6") if(DEFINED ENV{MILVUS_GPERFTOOLS_URL}) set(GPERFTOOLS_SOURCE_URL "$ENV{MILVUS_GPERFTOOLS_URL}") @@ -2414,21 +2415,56 @@ macro(build_libunwind) set(LIBUNWIND_SHARED_LIB "${LIBUNWIND_PREFIX}/lib/libunwind${CMAKE_SHARED_LIBRARY_SUFFIX}") set(LIBUNWIND_CONFIGURE_ARGS "--prefix=${LIBUNWIND_PREFIX}") - externalproject_add(libunwind_ep - URL - ${LIBUNWIND_SOURCE_URL} - ${EP_LOG_OPTIONS} - CONFIGURE_COMMAND - "./configure" - ${LIBUNWIND_CONFIGURE_ARGS} - BUILD_COMMAND - ${MAKE} ${MAKE_BUILD_ARGS} - BUILD_IN_SOURCE - 1 - INSTALL_COMMAND - ${MAKE} install - BUILD_BYPRODUCTS - ${LIBUNWIND_SHARED_LIB}) + if(USE_JFROG_CACHE STREQUAL "ON") + set(LIBUNWIND_CACHE_PACKAGE_NAME "libunwind_${LIBUNWIND_MD5}.tar.gz") + set(LIBUNWIND_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${LIBUNWIND_CACHE_PACKAGE_NAME}") + set(LIBUNWIND_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${LIBUNWIND_CACHE_PACKAGE_NAME}") + + execute_process(COMMAND wget -q --method HEAD ${LIBUNWIND_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${LIBUNWIND_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) + externalproject_add(libunwind_ep + URL + ${LIBUNWIND_SOURCE_URL} + ${EP_LOG_OPTIONS} + CONFIGURE_COMMAND + "./configure" + ${LIBUNWIND_CONFIGURE_ARGS} + BUILD_COMMAND + ${MAKE} ${MAKE_BUILD_ARGS} + BUILD_IN_SOURCE + 1 + INSTALL_COMMAND + ${MAKE} install + BUILD_BYPRODUCTS + ${LIBUNWIND_SHARED_LIB}) + + ExternalProject_Create_Cache(libunwind_ep ${LIBUNWIND_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/libunwind_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${LIBUNWIND_CACHE_URL}) + else() + file(DOWNLOAD ${LIBUNWIND_CACHE_URL} ${LIBUNWIND_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${LIBUNWIND_CACHE_URL} TO ${LIBUNWIND_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(libunwind_ep ${LIBUNWIND_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() + endif() + else() + externalproject_add(libunwind_ep + URL + ${LIBUNWIND_SOURCE_URL} + ${EP_LOG_OPTIONS} + CONFIGURE_COMMAND + "./configure" + ${LIBUNWIND_CONFIGURE_ARGS} + BUILD_COMMAND + ${MAKE} ${MAKE_BUILD_ARGS} + BUILD_IN_SOURCE + 1 + INSTALL_COMMAND + ${MAKE} install + BUILD_BYPRODUCTS + ${LIBUNWIND_SHARED_LIB}) + endif() file(MAKE_DIRECTORY "${LIBUNWIND_INCLUDE_DIR}") From b43ad62fa4f8a5a4fb99297f86adc76adfa05b10 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 6 Aug 2019 16:06:07 +0800 Subject: [PATCH 21/21] add gperftools cache Former-commit-id: 4e42aaf2971f31b69b9074af189c31110c9474a2 --- cpp/cmake/ThirdPartyPackages.cmake | 66 +++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index fc76ab714d..6b9ec3138f 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -449,6 +449,7 @@ else() set(GPERFTOOLS_SOURCE_URL "https://github.com/gperftools/gperftools/releases/download/gperftools-${GPERFTOOLS_VERSION}/gperftools-${GPERFTOOLS_VERSION}.tar.gz") endif() +set(GPERFTOOLS_MD5 "c6a852a817e9160c79bdb2d3101b4601") # ---------------------------------------------------------------------- # ARROW @@ -2494,21 +2495,56 @@ macro(build_gperftools) set(GPERFTOOLS_STATIC_LIB "${GPERFTOOLS_PREFIX}/lib/libprofiler${CMAKE_STATIC_LIBRARY_SUFFIX}") set(GPERFTOOLS_CONFIGURE_ARGS "--prefix=${GPERFTOOLS_PREFIX}") - externalproject_add(gperftools_ep - URL - ${GPERFTOOLS_SOURCE_URL} - ${EP_LOG_OPTIONS} - CONFIGURE_COMMAND - "./configure" - ${GPERFTOOLS_CONFIGURE_ARGS} - BUILD_COMMAND - ${MAKE} ${MAKE_BUILD_ARGS} - BUILD_IN_SOURCE - 1 - INSTALL_COMMAND - ${MAKE} install - BUILD_BYPRODUCTS - ${GPERFTOOLS_STATIC_LIB}) + if(USE_JFROG_CACHE STREQUAL "ON") + set(GPERFTOOLS_CACHE_PACKAGE_NAME "gperftools_${GPERFTOOLS_MD5}.tar.gz") + set(GPERFTOOLS_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${GPERFTOOLS_CACHE_PACKAGE_NAME}") + set(GPERFTOOLS_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${GPERFTOOLS_CACHE_PACKAGE_NAME}") + + execute_process(COMMAND wget -q --method HEAD ${GPERFTOOLS_CACHE_URL} RESULT_VARIABLE return_code) + message(STATUS "Check the remote file ${GPERFTOOLS_CACHE_URL}. return code = ${return_code}") + if (NOT return_code EQUAL 0) + externalproject_add(gperftools_ep + URL + ${GPERFTOOLS_SOURCE_URL} + ${EP_LOG_OPTIONS} + CONFIGURE_COMMAND + "./configure" + ${GPERFTOOLS_CONFIGURE_ARGS} + BUILD_COMMAND + ${MAKE} ${MAKE_BUILD_ARGS} + BUILD_IN_SOURCE + 1 + INSTALL_COMMAND + ${MAKE} install + BUILD_BYPRODUCTS + ${GPERFTOOLS_STATIC_LIB}) + + ExternalProject_Create_Cache(gperftools_ep ${GPERFTOOLS_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/gperftools_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${GPERFTOOLS_CACHE_URL}) + else() + file(DOWNLOAD ${GPERFTOOLS_CACHE_URL} ${GPERFTOOLS_CACHE_PACKAGE_PATH} STATUS status) + list(GET status 0 status_code) + message(STATUS "DOWNLOADING FROM ${GPERFTOOLS_CACHE_URL} TO ${GPERFTOOLS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}") + if (status_code EQUAL 0) + ExternalProject_Use_Cache(gperftools_ep ${GPERFTOOLS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR}) + endif() + endif() + else() + externalproject_add(gperftools_ep + URL + ${GPERFTOOLS_SOURCE_URL} + ${EP_LOG_OPTIONS} + CONFIGURE_COMMAND + "./configure" + ${GPERFTOOLS_CONFIGURE_ARGS} + BUILD_COMMAND + ${MAKE} ${MAKE_BUILD_ARGS} + BUILD_IN_SOURCE + 1 + INSTALL_COMMAND + ${MAKE} install + BUILD_BYPRODUCTS + ${GPERFTOOLS_STATIC_LIB}) + endif() ExternalProject_Add_StepDependencies(gperftools_ep build libunwind_ep)