From 17cd4644b4cfc15c067a48656f3c26eb9f19a716 Mon Sep 17 00:00:00 2001 From: Ayush Sharma Date: Thu, 14 Nov 2024 14:43:48 +0530 Subject: [PATCH] [PLAT-12081]Update YBC client and server version to 2.2.0.0-b9 Summary: Upgrade YBC client and server version to 2.2.0.0-b9. Also add `log_utc_time` gflag to all YBC deployments. Contains the following fix: [PLAT-12081] Upgrade glog version and lock all dependencies PR: https://github.com/yugabyte/ybc/pull/177 ``` This PR has the following changes 1.Upgrade the glog library to version 0.5 for the log_utc_time flag. 2.Lock rest of the dependencies to the existing versions. (Versions obtained from vcpkg install --dry-run) 3.Update the vcpkg submodule to latest release. 4.Update the github workflow to checkout a deep copy of vcpkg.git. This is required when building with specific versions in vcpkg.json. Test: 1.Clean built locally YBC multiple times to make sure the build doesn't break. 2.Ran all the UTs locally and made sure no tests break. 3.Created a RF3 universe with all db nodes having IST timezone. Replaced the YBC on leader node with my local built YBC. Verified that backup and restore operations work as expected. Restarted YBC on leader node with the log_utc_time flag and verified that timings in logs is as expected. ``` Test Plan: YBC test plan mentioned above. devitests. Reviewers: vkumar, kkg Reviewed By: vkumar Subscribers: svc_phabricator, yugaware Differential Revision: https://phorge.dev.yugabyte.com/D39984 --- managed/build.sbt | 2 +- .../src/main/java/com/yugabyte/yw/common/gflags/GFlagsUtil.java | 2 ++ managed/src/main/resources/reference.conf | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/managed/build.sbt b/managed/build.sbt index 00e4574e800b..66bb6f69b9d3 100644 --- a/managed/build.sbt +++ b/managed/build.sbt @@ -927,7 +927,7 @@ runPlatform := { } libraryDependencies += "org.yb" % "yb-client" % "0.8.95-SNAPSHOT" -libraryDependencies += "org.yb" % "ybc-client" % "2.2.0.0-b8" +libraryDependencies += "org.yb" % "ybc-client" % "2.2.0.0-b9" libraryDependencies += "org.yb" % "yb-perf-advisor" % "1.0.0-b33" libraryDependencies ++= Seq( diff --git a/managed/src/main/java/com/yugabyte/yw/common/gflags/GFlagsUtil.java b/managed/src/main/java/com/yugabyte/yw/common/gflags/GFlagsUtil.java index 72bce2412d1e..876b06efd9d6 100644 --- a/managed/src/main/java/com/yugabyte/yw/common/gflags/GFlagsUtil.java +++ b/managed/src/main/java/com/yugabyte/yw/common/gflags/GFlagsUtil.java @@ -488,6 +488,7 @@ public static Map getYbcFlags( ybcFlags.put("ysqlsh", getYbHomeDir(providerUUID) + YSQLSH_PATH); ybcFlags.put("ycqlsh", getYbHomeDir(providerUUID) + YCQLSH_PATH); ybcFlags.put("log_filename", YBC_LOG_FILENAME); + ybcFlags.put("log_utc_time", "true"); if (taskParam.enableNodeToNodeEncrypt) { ybcFlags.put(CERT_NODE_FILENAME, node.cloudInfo.private_ip); @@ -554,6 +555,7 @@ public static Map getYbcFlagsForK8s( ybcFlags.put("ysqlsh", ybHomeDir + YSQLSH_PATH); ybcFlags.put("ycqlsh", ybHomeDir + YCQLSH_PATH); ybcFlags.put("log_filename", YBC_LOG_FILENAME); + ybcFlags.put("log_utc_time", "true"); if (MapUtils.isNotEmpty(userIntent.ybcFlags)) { ybcFlags.putAll(userIntent.ybcFlags); diff --git a/managed/src/main/resources/reference.conf b/managed/src/main/resources/reference.conf index 8d754e3d44b9..3e93e9ea940a 100644 --- a/managed/src/main/resources/reference.conf +++ b/managed/src/main/resources/reference.conf @@ -1339,7 +1339,7 @@ yb { ybc { releases { - stable_version = "2.2.0.0-b8" + stable_version = "2.2.0.0-b9" path = "/opt/yugabyte/ybc/releases" } compatible_db_version = "2.15.0.0-b1"