SERVER-70121 SERVER-70083 Fix basic package tests

Ahmadkashif · Oct 15, 2022 · 8d463a6 · 8d463a6
1 parent 25ea623
commit 8d463a6
Show file tree

Hide file tree

Showing 15 changed files with 260 additions and 131 deletions.
diff --git a/buildscripts/package_test.py b/buildscripts/package_test.py
diff --git a/buildscripts/package_test_internal.py b/buildscripts/package_test_internal.py
@@ -52,7 +52,6 @@ def download_extract_package(package: str) -> List[str]:
 
 def run_apt_test(packages: List[str]):
     logging.info("Detected apt running test.")
-    run_and_log("DEBIAN_FRONTEND=noninteractive apt install -y wget")
     install_together = ""
     for package in packages:
         deb_names = download_extract_package(package)
@@ -63,7 +62,6 @@ def run_apt_test(packages: List[str]):
 
 def run_yum_test(packages: List[str]):
     logging.info("Detected yum running test.")
-    run_and_log("yum install -y wget")
     install_together = ""
     for package in packages:
         rpm_names = download_extract_package(package)
@@ -73,14 +71,45 @@ def run_yum_test(packages: List[str]):
 
 def run_zypper_test(packages: List[str]):
     logging.info("Detected zypper running test.")
-    run_and_log("zypper -n install wget")
     install_together = ""
     for package in packages:
         rpm_names = download_extract_package(package)
         install_together += ' '.join(rpm_names) + " "
     run_and_log("zypper -n --no-gpg-checks install {}".format(install_together))
 
 
+def run_startup_test():
+    logging.info("Starting mongod.")
+
+    # TODO SERVER-70425: We can remove these once we have figured out why
+    # packager.py sometimes uses distro files from older revisions.
+    # Remove the PIDFile, PermissionsStartOnly, and Type configurations from
+    # the systemd service file because they are not needed for simple-type
+    # (non-forking) services and confuse the systemd emulator script.
+    run_and_log(
+        "sed -Ei '/^PIDFile=|PermissionsStartOnly=|Type=/d' $(pkg-config systemd --variable=systemdsystemunitdir)/mongod.service"
+    )
+    # Remove the journal: line (and the next) from mongod.conf, which is a
+    # removed configuration. The Debian version of the config never got updated.
+    run_and_log("sed -i '/journal:/,+1d' /etc/mongod.conf")
+    # Remove fork: and pidFilePath: from mongod.conf because we want mongod to be
+    # a non-forking service under systemd.
+    run_and_log("sed -Ei '/fork:|pidFilePath:/d' /etc/mongod.conf")
+
+    # Overwrite the installed systemd with the emulator script and set up
+    # the required symlinks so it all works correctly.
+    # TODO SERVER-70426: Remove these when we have a fake systemd package
+    # that does all of this for us.
+    run_and_log("ln -sf /usr/bin/systemctl3.py /bin/systemctl")
+    run_and_log("ln -sf /usr/bin/systemctl3.py /usr/bin/systemctl")
+    run_and_log("ln -sf /usr/bin/systemctl3.py /bin/systemd")
+    run_and_log("ln -sf /usr/bin/systemctl3.py /usr/bin/systemd")
+    run_and_log("ln -sf /usr/bin/journalctl3.py /bin/journalctl")
+    run_and_log("ln -sf /usr/bin/journalctl3.py /usr/bin/journalctl")
+    run_and_log("systemctl enable mongod.service")
+    run_and_log("systemctl start mongod.service")
+
+
 package_urls = sys.argv[2:]
 
 if len(package_urls) == 0:
@@ -101,4 +130,6 @@ def run_zypper_test(packages: List[str]):
     logging.error("Found no supported package manager...Failing Test\n")
     sys.exit(1)
 
+run_startup_test()
+
 sys.exit(0)
diff --git a/buildscripts/simple_report.py b/buildscripts/simple_report.py
@@ -13,9 +13,9 @@ class Result(TypedDict, total=False):
     status: str
     exit_code: int
     test_file: str
-    start: int
-    end: int
-    elapsed: int
+    start: float
+    end: float
+    elapsed: float
     log_raw: str
 
 

diff --git a/debian/init.d b/debian/init.d
@@ -72,10 +72,10 @@ NUMACTL_ARGS="--interleave=all"
 if which numactl >/dev/null 2>/dev/null && numactl $NUMACTL_ARGS ls / >/dev/null 2>/dev/null
 then
     NUMACTL="`which numactl` -- $NUMACTL_ARGS"
-    DAEMON_OPTS=${DAEMON_OPTS:-"--config $CONF"}
+    DAEMON_OPTS=${DAEMON_OPTS:-"--config $CONF --fork --pidfilepath $PIDFILE"}
 else
     NUMACTL=""
-    DAEMON_OPTS="-- "${DAEMON_OPTS:-"--config $CONF"}
+    DAEMON_OPTS="-- "${DAEMON_OPTS:-"--config $CONF --fork --pidfilepath $PIDFILE"}
 fi
 
 

diff --git a/debian/mongod.service b/debian/mongod.service
@@ -9,7 +9,6 @@ User=mongodb
 Group=mongodb
 EnvironmentFile=-/etc/default/mongod
 ExecStart=/usr/bin/mongod --config /etc/mongod.conf
-PIDFile=/var/run/mongodb/mongod.pid
 # file size
 LimitFSIZE=infinity
 # cpu time

diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml
@@ -1571,6 +1571,7 @@ functions:
       - "src/evergreen/run_python_script.sh"
       - "buildscripts/package_test.py"
       - "--os=none"
+      - "--arch=${packager_arch}"
       - "--extra-test"
       - "${packager_distro}"
       - "https://s3.amazonaws.com/mciuploads/${project}/${build_variant}/${revision}/artifacts/${build_id}-packages.tgz"

diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml
@@ -292,6 +292,8 @@ buildvariants:
   - name: .ssl
   - name: .stitch
   - name: test_packages
+    distros:
+    - ubuntu1804-arm64-build
   - name: .publish
     distros:
     - rhel80-small
@@ -423,6 +425,8 @@ buildvariants:
     distros:
     - amazon2-arm64-large
   - name: test_packages
+    distros:
+    - ubuntu1804-arm64-build
   - name: .publish
     distros:
     - rhel80-small
@@ -472,7 +476,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-arm64-large
   - name: .publish
     distros:
     - rhel80-small
@@ -595,7 +599,7 @@ buildvariants:
     - amazon2022-arm64-large
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-arm64-large
   - name: .publish
     distros:
     - rhel80-small
@@ -777,7 +781,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-large
   - name: .publish
     distros:
     - debian11-small
@@ -841,7 +845,7 @@ buildvariants:
   - name: .publish_crypt
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-large
   - name: .publish
     distros:
     - debian11-small
@@ -946,9 +950,6 @@ buildvariants:
   - name: jsCore
   - name: sharding_gen
   - name: replica_sets_gen
-  - name: test_packages
-    distros:
-    - ubuntu2004-package
 
 - name: rhel80
   display_name: RHEL 8.0
@@ -1175,7 +1176,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu1804-arm64-build
   - name: .publish
     distros:
     - rhel80-small
@@ -1243,6 +1244,8 @@ buildvariants:
     - rhel82-arm64-large
   - name: .publish_crypt
   - name: test_packages
+    distros:
+    - ubuntu1804-arm64-build
   - name: .publish
     distros:
     - rhel80-small
@@ -1293,7 +1296,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-large
   - name: selinux_rhel9_org
   - name: .publish
     distros:
@@ -1370,7 +1373,7 @@ buildvariants:
   - name: unittest_shell_hang_analyzer_gen
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-large
   - name: selinux_rhel9_enterprise
   - name: .publish
     distros:
@@ -1427,6 +1430,9 @@ buildvariants:
   - name: .sharding .common !.csrs
   - name: .ssl
   - name: .stitch
+  - name: test_packages
+    distros:
+    - ubuntu2004-package
   - name: .publish
     distros:
     - suse12-small
@@ -1810,6 +1816,8 @@ buildvariants:
     distros:
     - ubuntu1804-test
   - name: test_packages
+    distros:
+    - ubuntu1804-arm64-build
   - name: .publish
     distros:
     - ubuntu1804-test
@@ -1849,6 +1857,8 @@ buildvariants:
   - name: jsCore
   - name: replica_sets_jscore_passthrough
   - name: test_packages
+    distros:
+    - ubuntu1804-arm64-build
   - name: .publish
     distros:
     - ubuntu1804-test
@@ -1904,7 +1914,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-large
   - name: .publish
     distros:
     - ubuntu2204-small
@@ -1961,7 +1971,6 @@ buildvariants:
   - name: test_packages
     distros:
     - ubuntu2004-package
-  - name: test_packages_complete
   - name: .publish
     distros:
     - ubuntu2004-small
@@ -2094,7 +2103,10 @@ buildvariants:
   - name: sharding_auth_gen
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-large
+  - name: test_packages_complete
+    distros:
+    - ubuntu2204-large
   - name: .publish
     distros:
     - ubuntu2204-small
@@ -2106,7 +2118,7 @@ buildvariants:
   modules:
   - enterprise
   run_on:
-  - ubuntu2004-arm64-large
+  - ubuntu1804-arm64-build
   expansions:
     additional_package_targets: >-
       archive-mongocryptd
@@ -2156,6 +2168,8 @@ buildvariants:
   - name: .crypt
   - name: .publish_crypt
   - name: test_packages
+    distros:
+    - ubuntu1804-arm64-build
   - name: .publish
     distros:
     - ubuntu2004-test
@@ -2165,7 +2179,7 @@ buildvariants:
   display_name: Ubuntu 20.04 arm64
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   run_on:
-  - ubuntu2004-arm64-large
+  - ubuntu1804-arm64-build
   expansions:
     push_path: linux
     push_bucket: downloads.mongodb.org
@@ -2193,7 +2207,8 @@ buildvariants:
   - name: jsCore
   - name: replica_sets_jscore_passthrough
   - name: test_packages
-  - name: test_packages_complete
+    distros:
+    - ubuntu1804-arm64-build
   - name: .publish
     distros:
     - ubuntu2004-test
@@ -2212,7 +2227,7 @@ buildvariants:
     push_path: linux
     push_bucket: downloads.10gen.com
     push_name: linux
-    push_arch: aarch64-enterprise-ubuntu2204
+    push_arch: arm64-enterprise-ubuntu2204
     compile_flags: --ssl MONGO_DISTMOD=ubuntu2204 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
     crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique"
     resmoke_jobs_max: 4 # Avoid starting too many mongod's on ARM test servers
@@ -2250,7 +2265,10 @@ buildvariants:
   - name: .publish_crypt
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-arm64-large
+  - name: test_packages_complete
+    distros:
+    - ubuntu2204-arm64-large
   - name: .publish
     distros:
     - ubuntu2204-small
@@ -2265,7 +2283,7 @@ buildvariants:
     push_path: linux
     push_bucket: downloads.mongodb.org
     push_name: linux
-    push_arch: aarch64-ubuntu2204
+    push_arch: arm64-ubuntu2204
     compile_flags: --ssl MONGO_DISTMOD=ubuntu2204 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
     resmoke_jobs_max: 8 # Avoid starting too many mongod's on ARM test servers
     has_packages: true
@@ -2285,7 +2303,7 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: test_packages
     distros:
-    - ubuntu2004-package
+    - ubuntu2204-arm64-large
   - name: .publish
     distros:
     - ubuntu2204-small

diff --git a/rpm/init.d-mongod b/rpm/init.d-mongod
@@ -9,10 +9,13 @@
 
 . /etc/rc.d/init.d/functions
 
+PIDFILEPATH="/var/run/mongodb/mongod.pid"
+PIDDIR=`dirname $PIDFILEPATH`
+
 # NOTE: if you change any OPTIONS here, you get what you pay for:
 # this script assumes all options are in the config file.
 CONFIGFILE="/etc/mongod.conf"
-OPTIONS=" -f $CONFIGFILE"
+OPTIONS=" -f $CONFIGFILE --fork --pidfilepath $PIDFILEPATH"
 
 mongod=${MONGOD-/usr/bin/mongod}
 
@@ -37,10 +40,6 @@ else
     NUMACTL=""
 fi
 
-# things from mongod.conf get there by mongod reading it
-PIDFILEPATH="`awk -F'[:=]' -v IGNORECASE=1 '/^[[:blank:]]*(processManagement\.)?pidfilepath[[:blank:]]*[:=][[:blank:]]*/{print $2}' \"$CONFIGFILE\" | tr -d \"[:blank:]\\"'\" | awk -F'#' '{print $1}'`"
-PIDDIR=`dirname $PIDFILEPATH`
-
 start()
 {
   # Make sure the default pidfile directory exists

diff --git a/rpm/init.d-mongod.suse b/rpm/init.d-mongod.suse
@@ -16,10 +16,13 @@
 . /etc/rc.status
 rc_reset
 
+PIDFILEPATH="/var/run/mongodb/mongod.pid"
+PIDDIR=`dirname $PIDFILEPATH`
+
 # NOTE: if you change any OPTIONS here, you get what you pay for:
 # this script assumes all options are in the config file.
 CONFIGFILE="/etc/mongod.conf"
-OPTIONS=" -f $CONFIGFILE"
+OPTIONS=" -f $CONFIGFILE --fork --pidfilepath $PIDFILEPATH"
 
 mongod=${MONGOD-/usr/bin/mongod}
 
@@ -44,10 +47,6 @@ else
     NUMACTL=""
 fi
 
-# things from mongod.conf get there by mongod reading it
-PIDFILEPATH=`awk -F'[:=]' -v IGNORECASE=1 '/^[[:blank:]]*(processManagement\.)?pidfilepath[[:blank:]]*[:=][[:blank:]]*/{print $2}' "$CONFIGFILE" | tr -d "[:blank:]\"'" | awk -F'#' '{print $1}'`
-PIDDIR=`dirname $PIDFILEPATH`
-
 start()
 {