From 0370dd47727fc183fadcb9ddf6ade6b38bb43392 Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Thu, 15 Jun 2023 10:13:52 -0700 Subject: [PATCH 1/7] Update MacOS resource classes in CircleCI config Summary: The `large` MacOS class on CircleCI is going away; the PR updates it to its recommended successor `macos.m1.large.gen1`. Test Plan: CI --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c614d3f0e22..d3391517cb5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -210,7 +210,7 @@ jobs: build-macos: macos: xcode: 12.5.1 - resource_class: large + resource_class: macos.m1.large.gen1 environment: ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc cause env_test hang, disable it for now steps: @@ -223,7 +223,7 @@ jobs: build-macos-cmake: macos: xcode: 12.5.1 - resource_class: large + resource_class: macos.m1.large.gen1 parameters: run_even_tests: description: run even or odd tests, used to split tests to 2 groups @@ -608,7 +608,7 @@ jobs: build-macos-java: macos: xcode: 12.5.1 - resource_class: large + resource_class: macos.m1.large.gen1 environment: JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc causes java 8 crash @@ -633,7 +633,7 @@ jobs: build-macos-java-static: macos: xcode: 12.5.1 - resource_class: large + resource_class: macos.m1.large.gen1 environment: JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home steps: @@ -658,7 +658,7 @@ jobs: build-macos-java-static-universal: macos: xcode: 12.5.1 - resource_class: large + resource_class: macos.m1.large.gen1 environment: JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home steps: From a767f84391f3958679fd720af9c43495f8e6b224 Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Thu, 15 Jun 2023 10:26:20 -0700 Subject: [PATCH 2/7] Add a dummy change to trigger build on CI --- db/wide/wide_columns.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/db/wide/wide_columns.cc b/db/wide/wide_columns.cc index 186be7f854c..8599c5ec6e5 100644 --- a/db/wide/wide_columns.cc +++ b/db/wide/wide_columns.cc @@ -9,6 +9,8 @@ namespace ROCKSDB_NAMESPACE { +// DUMMY COMMENT TO TRIGGER CI -- WILL BE REMOVED + const Slice kDefaultWideColumnName; const WideColumns kNoWideColumns; From 2a8457c073f8696bc2f8e399bc82478df0cc0fa5 Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Thu, 15 Jun 2023 10:30:05 -0700 Subject: [PATCH 3/7] Revert "Add a dummy change to trigger build on CI" This reverts commit a767f84391f3958679fd720af9c43495f8e6b224. --- db/wide/wide_columns.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/db/wide/wide_columns.cc b/db/wide/wide_columns.cc index 8599c5ec6e5..186be7f854c 100644 --- a/db/wide/wide_columns.cc +++ b/db/wide/wide_columns.cc @@ -9,8 +9,6 @@ namespace ROCKSDB_NAMESPACE { -// DUMMY COMMENT TO TRIGGER CI -- WILL BE REMOVED - const Slice kDefaultWideColumnName; const WideColumns kNoWideColumns; From 40d78eef7b528087fc673243c937313fd4f1ad19 Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Thu, 15 Jun 2023 16:08:33 -0700 Subject: [PATCH 4/7] Try m1.medium first --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d3391517cb5..f074688fb82 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -210,7 +210,7 @@ jobs: build-macos: macos: xcode: 12.5.1 - resource_class: macos.m1.large.gen1 + resource_class: macos.m1.medium.gen1 environment: ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc cause env_test hang, disable it for now steps: @@ -223,7 +223,7 @@ jobs: build-macos-cmake: macos: xcode: 12.5.1 - resource_class: macos.m1.large.gen1 + resource_class: macos.m1.medium.gen1 parameters: run_even_tests: description: run even or odd tests, used to split tests to 2 groups @@ -608,7 +608,7 @@ jobs: build-macos-java: macos: xcode: 12.5.1 - resource_class: macos.m1.large.gen1 + resource_class: macos.m1.medium.gen1 environment: JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc causes java 8 crash @@ -633,7 +633,7 @@ jobs: build-macos-java-static: macos: xcode: 12.5.1 - resource_class: macos.m1.large.gen1 + resource_class: macos.m1.medium.gen1 environment: JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home steps: @@ -658,7 +658,7 @@ jobs: build-macos-java-static-universal: macos: xcode: 12.5.1 - resource_class: macos.m1.large.gen1 + resource_class: macos.m1.medium.gen1 environment: JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home steps: From 4ff5c120df64da1029ef0d33d4039d7f3ead6d62 Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Thu, 15 Jun 2023 16:14:03 -0700 Subject: [PATCH 5/7] Update Xcode version too --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f074688fb82..860038b93f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -209,7 +209,7 @@ executors: jobs: build-macos: macos: - xcode: 12.5.1 + xcode: 14.3.1 resource_class: macos.m1.medium.gen1 environment: ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc cause env_test hang, disable it for now @@ -222,7 +222,7 @@ jobs: build-macos-cmake: macos: - xcode: 12.5.1 + xcode: 14.3.1 resource_class: macos.m1.medium.gen1 parameters: run_even_tests: @@ -607,7 +607,7 @@ jobs: build-macos-java: macos: - xcode: 12.5.1 + xcode: 14.3.1 resource_class: macos.m1.medium.gen1 environment: JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home @@ -632,7 +632,7 @@ jobs: build-macos-java-static: macos: - xcode: 12.5.1 + xcode: 14.3.1 resource_class: macos.m1.medium.gen1 environment: JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home @@ -657,7 +657,7 @@ jobs: build-macos-java-static-universal: macos: - xcode: 12.5.1 + xcode: 14.3.1 resource_class: macos.m1.medium.gen1 environment: JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home From 1225f48514fdaa26bd4d8b9a93cf15be0060526d Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Fri, 16 Jun 2023 12:05:24 -0700 Subject: [PATCH 6/7] Install Rosetta 2 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 860038b93f7..78f9c817748 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,6 +16,7 @@ commands: - run: name: Install JDK 8 on macos command: | + sudo softwareupdate --install-rosetta --agree-to-license brew install --cask adoptopenjdk/openjdk/adoptopenjdk8 increase-max-open-files-on-macos: From 577ff7a3d0895bf3afb193f74f9d6e8e7c6a9c49 Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Fri, 16 Jun 2023 14:02:32 -0700 Subject: [PATCH 7/7] Try to reduce parallelism --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 78f9c817748..9eb4c9d3430 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -218,7 +218,7 @@ jobs: - increase-max-open-files-on-macos - install-gflags-on-macos - pre-steps-macos - - run: ulimit -S -n `ulimit -H -n` && OPT=-DCIRCLECI make V=1 J=32 -j32 all + - run: ulimit -S -n `ulimit -H -n` && OPT=-DCIRCLECI make V=1 J=16 -j16 all - post-steps build-macos-cmake: @@ -240,20 +240,20 @@ jobs: command: ulimit -S -n `ulimit -H -n` && mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. - run: name: "Build tests" - command: cd build && make V=1 -j32 + command: cd build && make V=1 -j16 - when: condition: << parameters.run_even_tests >> steps: - run: name: "Run even tests" - command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j32 -I 0,,2 + command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j16 -I 0,,2 - when: condition: not: << parameters.run_even_tests >> steps: - run: name: "Run odd tests" - command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j32 -I 1,,2 + command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j16 -I 1,,2 - post-steps build-linux: