diff --git a/oximeter/db/src/client.rs b/oximeter/db/src/client.rs index e1ed06554c..55fe014225 100644 --- a/oximeter/db/src/client.rs +++ b/oximeter/db/src/client.rs @@ -651,9 +651,11 @@ impl Client { Err(Error::Database(err)) // Case 1: The database has not been created. if err.contains("Database oximeter doesn't exist") || + err.contains("Database oximeter does not exist") || // Case 2: The database has been created, but it's old (exists // prior to the version table). - err.contains("Table oximeter.version doesn't exist") => + err.contains("Table oximeter.version doesn't exist") || + err.contains("Table oximeter.version does not exist") => { warn!(self.log, "oximeter database does not exist, or is out-of-date"); 0 diff --git a/tools/ci_download_clickhouse b/tools/ci_download_clickhouse index 7d634a3237..737024a0f3 100755 --- a/tools/ci_download_clickhouse +++ b/tools/ci_download_clickhouse @@ -19,8 +19,8 @@ DOWNLOAD_DIR="$TARGET_DIR/downloads" # Location where the final clickhouse directory should end up. DEST_DIR="./$TARGET_DIR/clickhouse" -# If you change this, you must also update the md5sums below -CIDL_VERSION="v22.8.9.24" +# If you change this, you must also update the md5sums in clickhouse_checksums +CIDL_VERSION="v23.8.7.24" source "$SOURCE_DIR/clickhouse_checksums" # Download from manually-populated S3 bucket for now @@ -113,7 +113,6 @@ function configure_os CIDL_PLATFORM="illumos" CIDL_MD5="$CIDL_MD5_ILLUMOS" CIDL_MD5FUNC="do_md5sum" - CIDL_DASHREV=-1 ;; *) fail "unsupported OS: $1" diff --git a/tools/clickhouse_checksums b/tools/clickhouse_checksums index 92a5237301..afddb15cab 100644 --- a/tools/clickhouse_checksums +++ b/tools/clickhouse_checksums @@ -1,3 +1,3 @@ -CIDL_MD5_DARWIN="20603974a929926591fca70ff1df0e45" -CIDL_MD5_LINUX="ea909519bd9d989fd5d090fd9bdd42f1" -CIDL_MD5_ILLUMOS="7702939ce5b4b51846a1ba39f1392306" +CIDL_MD5_DARWIN="3e20c3284b7e6b0cfcfedf622ecf547a" +CIDL_MD5_LINUX="f6c30a25a86deac3bad6c50dcf758fd5" +CIDL_MD5_ILLUMOS="409222de8ecb59e5dd97dcc942ccdffe" diff --git a/tools/install_builder_prerequisites.sh b/tools/install_builder_prerequisites.sh index d3ecd8eaa8..8df27a90d8 100755 --- a/tools/install_builder_prerequisites.sh +++ b/tools/install_builder_prerequisites.sh @@ -123,12 +123,15 @@ function install_packages { elif [[ "${HOST_OS}" == "SunOS" ]]; then CLANGVER=15 PGVER=13 + RTVER=13 packages=( "pkg:/package/pkg" "build-essential" "library/postgresql-$PGVER" "pkg-config" "library/libxmlsec1" + "system/library/gcc-runtime@$RTVER" + "system/library/g++-runtime@$RTVER" # "bindgen leverages libclang to preprocess, parse, and type check C and C++ header files." "pkg:/ooce/developer/clang-$CLANGVER" ) @@ -151,7 +154,8 @@ function install_packages { } pkg mediator -a - pkg list -v "${packages[@]}" + pkg publisher + pkg list -afv "${packages[@]}" elif [[ "${HOST_OS}" == "Darwin" ]]; then packages=( 'coreutils'