- Compass-ci - mailweb.openeuler.org

Re: [PATCH v2 compass-ci] data-api: add es search api
by Wei Jihui 08 Feb '22

08 Feb '22

On Tue, Feb 08, 2022 at 10:28:21AM +0800, Wu Fengguang wrote: >>+ def self.search(index, params) >>+ request_body = JSON.parse(params) >>+ query = request_body['query'] || {'query' => {}} >>+ >>+ return "index is empty!" if index.nil? >>+ return "#{index} is not opened" unless OPEN_INDEX.include?(index) > >这里的return会在上一级被作为HTTP 200 >但看起来是一个错误情况。是的，抛出错误更好一些。 Thanks, Jihui > >>+ def self.search_by_sql(index, params) >>+ request_body = JSON.parse(params) >>+ query = request_body['query'] >>+ >>+ return "query table is empty!" if index.nil? >>+ return "#{index} is not opened" unless OPEN_INDEX.include?(index) > >同上。 > >Thanks, >Fengguang >

1 0

Re: [PATCH v2 compass-ci] data-api: add es search api
by Wei Jihui 08 Feb '22

08 Feb '22

On Tue, Feb 08, 2022 at 10:24:24AM +0800, Wu Fengguang wrote: >>+module EsDataApi >>+ ES_ACCOUNTS = ESClient.new(index: 'accounts') >>+ OPEN_INDEX = Set.new(['jobs']) >>+ REQUIRED_TOKEN_INDEX = Set.new(['jobs']) >>+ ES_QUERY_KEYWORD = Set.new(['term', 'match']) >>+ >>+ > >2 empty lines can be merged. ok. > >>+ def self.search(index, params) >>+ request_body = JSON.parse(params) >>+ query = request_body['query'] || {'query' => {}} >>+ >>+ return "index is empty!" if index.nil? >>+ return "#{index} is not opened" unless OPEN_INDEX.include?(index) >>+ >>+ if REQUIRED_TOKEN_INDEX.include?(index) >>+ cci_authorization = request_body['cci_authorization'] || {} >>+ my_account = cci_authorization['my_account'] >>+ my_token = cci_authorization['my_token'] >>+ raise "user authentication failed" unless verify_user(my_account, my_token) > >加上my_account，把错误信息变得友好些。 ok. user authentication failed，please check my_account and my_token. > >>+ > >函数体有点大。功能型代码块，适合独立拆分出去。 ok. >>+ def self.verify_user(my_account, my_token) >>+ raise "missed my_account" unless my_account >>+ raise "missed my_token" unless my_token >>+ >>+ query = {} >>+ query['my_account'] = my_account if my_account >>+ query['my_token'] = my_token if my_token > >这里的两个if前面判断过了，可省略 > ok Thanks, Jihui >>+ result = ES_ACCOUNTS.multi_field_query(query)['hits']['hits'] >>+ return nil if result.size == 0 >>+ >>+ result[0]['_source']['my_token'] == my_token >>+ end >>+end >>-- >>2.23.0 >>

1 0

Re: [PATCH compass-ci] src/lib/web_backend.rb: set page_num and page_size to a default value.
by Wei Jihui 08 Feb '22

08 Feb '22

On Mon, Feb 07, 2022 at 04:02:52PM +0800, Li Ping wrote: >[why] >if no parameter is transferred, the default value is not set, As a >result, data cannot be obtained. > 我已经撤销了这个patch,合入最新的patch。 Thanks, Jihui >Signed-off-by: Li Ping <1477412247(a)qq.com> >--- > src/lib/web_backend.rb | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > >diff --git a/src/lib/web_backend.rb b/src/lib/web_backend.rb >index f47950e6..571d7c64 100644 >--- a/src/lib/web_backend.rb >+++ b/src/lib/web_backend.rb >@@ -1026,8 +1026,10 @@ end > def get_srpm_info(params) > begin > my_data = MyData.new >+ page_size = params['page_size'] || 10 >+ page_num = params['page_num'] || 0 > info=[] >- srpm_infos = my_data.get_srpm_info(size: params['page_size'].to_i, from: params['page_num'].to_i) >+ srpm_infos = my_data.get_srpm_info(size: page_size, from: page_num) > srpm_infos['hits']['hits'].each do |source| > info << source['_source'] > end >-- >2.23.0 >

1 0

Re: [PATCH lkp-tests 3/3] lkp-tests/*: add new flow for install lkp depends
by Wei Jihui 08 Feb '22

08 Feb '22

On Sun, Jan 30, 2022 at 08:58:23AM +0800, Wang Yong wrote: >[why] >install lkp depends before test suite to satisfy lkp-tests > >Signed-off-by: Wang Yong <wangyong187(a)huawei.com> >--- > lib/job2sh.rb | 2 ++ > setup/install_depends | 49 +++++++++++++++++++++++++++++++++++-------- > 2 files changed, 42 insertions(+), 9 deletions(-) > >diff --git a/lib/job2sh.rb b/lib/job2sh.rb >index 4e8bf97fb..32caf2ade 100755 >--- a/lib/job2sh.rb >+++ b/lib/job2sh.rb >@@ -316,6 +316,7 @@ class Job2sh < Job > @monitors = available_programs(:monitors) > @setups = available_programs(:setup) > @programs = available_programs(:workload_elements) >+ @lkp = {"install_depends"=>{}} how about use '@install_depends'? Thanks, Jihui > > unless job > job = (@jobx || @job).clone # a shallow copy so that delete_if won't impact @job >@@ -336,6 +337,7 @@ class Job2sh < Job > out_line > out_line "\texport_top_env" > out_line >+ parse_hash [], @lkp > parse_hash [], job > out_line "}\n\n" > @script_lines >diff --git a/setup/install_depends b/setup/install_depends >index b5390cad1..8a6da808e 100755 >--- a/setup/install_depends >+++ b/setup/install_depends >@@ -1,6 +1,7 @@ > #!/bin/sh > > . $LKP_SRC/lib/detect-system.sh >+. $LKP_SRC/lib/install.sh > > detect_system > >@@ -16,8 +17,6 @@ set_ubuntu_debian() > -e "s|http://archive.ubuntu.com|${mirror_addr}|g" \ > -i.bak \ > /etc/apt/sources.list >- >- apt-get install -yqm "${packages}" > } > > set_suse() >@@ -25,8 +24,6 @@ set_suse() > sed -e "s|^baseurl=http://download.opensuse.org|baseurl=${mirror_addr}/opensuse|g" \ > -i.bak \ > /etc/zypp/repos.d/repo-*.repo >- >- zypper -q install -y "${packages}" > } > > set_archlinux() >@@ -36,8 +33,6 @@ set_archlinux() > else > sed -i "1s;^;Server\\ =\\ ${mirror_addr}/archlinux/\$arch/\$repo\\n;" /etc/pacman.d/mirrorlist > fi >- >- pacman -Syq --noconfirm --needed "${packages}" > } > > set_fedora() >@@ -46,8 +41,6 @@ set_fedora() > -e "s|^#baseurl=http://download.example/pub/fedora/linux|baseurl=${mirror_addr}/fedora|g" \ > -i.bak \ > /etc/yum.repos.d/fedora*.repo >- >- dnf install -y -q "${packages}" > } > > set_centos() >@@ -74,7 +67,43 @@ set_centos() > ;; > > esac >- yum install -y -q "${packages}" >+} >+ >+adapt_lkp_depends() >+{ >+ os=$(echo "${_system_name}" | tr '[:upper:]' '[:lower:]') >+ lkp_depends=$(get_dependency_packages $os lkp | xargs) >+} >+ >+get_package_manager() >+{ >+ has_cmd "yum" && installer="yum" >+ has_cmd "dnf" && installer="dnf" && return >+ has_cmd "apt-get" && installer="apt-get" && return >+ has_cmd "pacman" && installer="pacman" && return >+ has_cmd "zypper" && installer="zypper" && return >+} >+ >+install_depends() >+{ >+ packages="$1" >+ >+ get_package_manager >+ case "$installer" in >+ apt-get) >+ export DEBIAN_FRONTEND=noninteractive >+ "$installer" install -yqm ${packages} >+ ;; >+ dnf|yum) >+ "$installer" install -y -q --skip-broken ${packages} >+ ;; >+ pacman) >+ "$installer" -Sy --noconfirm --needed ${packages} >+ ;; >+ zypper) >+ "$installer" -q install -y ${packages} >+ ;; >+ esac > } > > set_local_mirror() >@@ -104,3 +133,5 @@ set_local_mirror() > } > > set_local_mirror >+adapt_lkp_depends >+install_depends "${lkp_depends}" >-- >2.23.0 >

1 0