pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #266093 from K900/pipe-systemd-cat

treewide: replace `<command> | systemd-cat` with `systemd-cat <command>`

authored by

K900 and committed by
GitHub 63fe80d8 2732e7de

+18 -18
+1 -1
nixos/tests/castopod.nix
··· 82 82 castopod.succeed("curl -s http://localhost/cp-install | grep 'Create your Super Admin account' > /dev/null") 83 83 84 84 with subtest("Create superadmin and log in"): 85 - castopod.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") 85 + castopod.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner") 86 86 ''; 87 87 })
+12 -12
nixos/tests/hadoop/hadoop.nix
··· 176 176 nn2.succeed("systemctl stop hdfs-zkfc") 177 177 178 178 # Initialize zookeeper for failover controller 179 - nn1.succeed("sudo -u hdfs hdfs zkfc -formatZK 2>&1 | systemd-cat") 179 + nn1.succeed("sudo -u hdfs systemd-cat hdfs zkfc -formatZK") 180 180 181 181 # Format NN1 and start it 182 - nn1.succeed("sudo -u hdfs hadoop namenode -format 2>&1 | systemd-cat") 182 + nn1.succeed("sudo -u hdfs systemd-cat hadoop namenode -format") 183 183 nn1.succeed("systemctl start hdfs-namenode") 184 184 nn1.wait_for_open_port(9870) 185 185 nn1.wait_for_open_port(8022) 186 186 nn1.wait_for_open_port(8020) 187 187 188 188 # Bootstrap NN2 from NN1 and start it 189 - nn2.succeed("sudo -u hdfs hdfs namenode -bootstrapStandby 2>&1 | systemd-cat") 189 + nn2.succeed("sudo -u hdfs systemd-cat hdfs namenode -bootstrapStandby") 190 190 nn2.succeed("systemctl start hdfs-namenode") 191 191 nn2.wait_for_open_port(9870) 192 192 nn2.wait_for_open_port(8022) 193 193 nn2.wait_for_open_port(8020) 194 - nn1.succeed("netstat -tulpne | systemd-cat") 194 + nn1.succeed("systemd-cat netstat -tulpne") 195 195 196 196 # Start failover controllers 197 197 nn1.succeed("systemctl start hdfs-zkfc") ··· 200 200 # DN should have started by now, but confirm anyway 201 201 dn1.wait_for_unit("hdfs-datanode") 202 202 # Print states of namenodes 203 - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") 203 + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") 204 204 # Wait for cluster to exit safemode 205 205 client.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") 206 - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") 206 + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") 207 207 # test R/W 208 208 client.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile") 209 209 assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") ··· 211 211 # Test NN failover 212 212 nn1.succeed("systemctl stop hdfs-namenode") 213 213 assert "active" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") 214 - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") 214 + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") 215 215 assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") 216 216 217 217 nn1.succeed("systemctl start hdfs-namenode") ··· 219 219 nn1.wait_for_open_port(8022) 220 220 nn1.wait_for_open_port(8020) 221 221 assert "standby" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") 222 - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") 222 + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") 223 223 224 224 #### YARN tests #### 225 225 ··· 236 236 nm1.wait_for_open_port(8042) 237 237 nm1.wait_for_open_port(8040) 238 238 client.wait_until_succeeds("yarn node -list | grep Nodes:1") 239 - client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") 240 - client.succeed("sudo -u yarn yarn node -list | systemd-cat") 239 + client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState") 240 + client.succeed("sudo -u yarn systemd-cat yarn node -list") 241 241 242 242 # Test RM failover 243 243 rm1.succeed("systemctl stop yarn-resourcemanager") 244 244 assert "standby" not in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") 245 - client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") 245 + client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState") 246 246 rm1.succeed("systemctl start yarn-resourcemanager") 247 247 rm1.wait_for_unit("yarn-resourcemanager") 248 248 rm1.wait_for_open_port(8088) 249 249 assert "standby" in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") 250 - client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") 250 + client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState") 251 251 252 252 assert "Estimated value of Pi is" in client.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10") 253 253 assert "SUCCEEDED" in client.succeed("yarn application -list -appStates FINISHED")
+2 -2
nixos/tests/hadoop/hdfs.nix
··· 50 50 namenode.wait_for_unit("hdfs-namenode") 51 51 namenode.wait_for_unit("network.target") 52 52 namenode.wait_for_open_port(8020) 53 - namenode.succeed("ss -tulpne | systemd-cat") 54 - namenode.succeed("cat /etc/hadoop*/hdfs-site.xml | systemd-cat") 53 + namenode.succeed("systemd-cat ss -tulpne") 54 + namenode.succeed("systemd-cat cat /etc/hadoop*/hdfs-site.xml") 55 55 namenode.wait_for_open_port(9870) 56 56 57 57 datanode.wait_for_unit("hdfs-datanode")
+2 -2
nixos/tests/iscsi-multipath-root.nix
··· 202 202 initiatorAuto.succeed("umount /mnt") 203 203 204 204 initiatorAuto.succeed("systemctl restart multipathd") 205 - initiatorAuto.succeed("multipath -ll | systemd-cat") 205 + initiatorAuto.succeed("systemd-cat multipath -ll") 206 206 207 207 # Install our RootDisk machine to 123456, the alias to the device that multipath is now managing 208 208 initiatorAuto.succeed("mount /dev/mapper/123456 /mnt") ··· 223 223 initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.1.3 --login") 224 224 initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login") 225 225 initiatorRootDisk.succeed("systemctl restart multipathd") 226 - initiatorRootDisk.succeed("multipath -ll | systemd-cat") 226 + initiatorRootDisk.succeed("systemd-cat multipath -ll") 227 227 228 228 # Verify we can write and sync the root disk 229 229 initiatorRootDisk.succeed("mkdir /scratch")
+1 -1
nixos/tests/vaultwarden.nix
··· 173 173 ) 174 174 175 175 with subtest("use the web interface to sign up, log in, and save a password"): 176 - server.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") 176 + server.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner") 177 177 178 178 with subtest("log in with the cli"): 179 179 key = client.succeed(