diff options
| author |   Ultrabug <ultrabug@gentoo.org> | 2020-03-04 16:41:12 +0100 |
|---|---|---|
| committer | Ultrabug <ultrabug@gentoo.org> | 2020-03-04 16:41:12 +0100 |
| commit | 1c160566b50a284b374b291626e637e402989ea1 (patch) | |
| tree | 45b7f96de6d23385b65762aba5bec83b202f4abe | |
| parent | dev-db/scylla-bin: drain on stop, add tools as dependency (diff) | |
| download | ultrabug-1c160566b50a284b374b291626e637e402989ea1.tar.gz ultrabug-1c160566b50a284b374b291626e637e402989ea1.tar.bz2 ultrabug-1c160566b50a284b374b291626e637e402989ea1.zip | |
dev-db/scylla-bin: initd make drain fail gracefully
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
| -rw-r--r-- | dev-db/scylla-bin/Manifest | 18 | ||||
| -rw-r--r-- | dev-db/scylla-bin/files/scylla-server.initd | 7 |
2 files changed, 14 insertions, 11 deletions
diff --git a/dev-db/scylla-bin/Manifest b/dev-db/scylla-bin/Manifest index 474b4ca..60b44ac 100644 --- a/dev-db/scylla-bin/Manifest +++ b/dev-db/scylla-bin/Manifest @@ -5,7 +5,7 @@ AUX 10-scylla.conf 64 BLAKE2B 31ce1b2173214bcac351b71cf19e5506ab08cefbca446ce23a AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6f5a51c9f6656cf0f989c133e8e45b221991800fcc79fd1505b037410dde7d5dfffdf75e0ee6670090 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402 AUX scylla-jmx.initd 585 BLAKE2B 268f2c97d31f101c6911cd2144f9df6068f8fce706d005698c208d862936435e5d8d80527bdf676611ef7c976d8e6bded890ff2c30a3d4cc6d8b0c49db6299d1 SHA512 b1104bb8bfb1d276c21d5865e7aacf1ba64cc509d40efee88fc4c8ebb9a1be5dbf343b8d68b1c977dd0ad66bcd63a4ff60c5a3a34092ab45b0eae28871869bae AUX scylla-server.confd 396 BLAKE2B dc522b308985e51c24449a333d793eaa777a74b8b5594f1ff4a092aae003202791019a255ea478c4e794a83ca0e01d2c49aac3d267501624f461fa3edfe1c41f SHA512 51739cdeedaedb1a73a345ec6a4a2761d29fac1b9cf61f02937559aed43f02112109464254213118d40af1fb7e8491c22f8cb88908c9c88523dfe1b78b8430c7 -AUX scylla-server.initd 1069 BLAKE2B 9752275e7a55897b575447c030d7268507e27a81f1b2d17bab03b3e1811e2a279402c73713c90aa6bb4c3de037159687c0cd8a82ce70b82742656317396fe3f0 SHA512 8f73f8945394de71e8360653c6f1f48f746dc11bf39b77849c999b472ed8b4a8f862cf87e8c34711960b502d6746ebf51b28aa421690b1f397bb746321211ccf +AUX scylla-server.initd 1113 BLAKE2B e8cfc55773c66ab14d6f9eb98df03b763fcf63bb419a33c2c7cf725042a097f6a0d270504d91a12ed92c7e2fcb080c594949c809469180922487cdfba9326991 SHA512 e609c63a810f28a6acbe5597dfd3e719cde72c82ec9e81b6fd12d2c5704f8662e109ffe7f410a9b2f445cf9c8a197af52ef230fbfcbfb4df41cf83d614166d24 AUX scylla.sudoers 162 BLAKE2B 9aa0dce391da1f420a070d73d061452eeba60ad268f13a5bb8c0525d714d27dfa438efa9c6871c916b82ebf56f34c507826315de8b1fadc3d0eb5feae663cbcc SHA512 aabdeb3854eaad4b1cf9037a998cf94b8f55b2011e8f81a1778095b71806d89e217f2025e772c636569f833f7df45108e2e30c2c1e70fdb59acf37e6cdf81485 DIST scylla-bin-3.1_p259-package.tar.gz 1112368776 BLAKE2B 593f9bed2cccf1dacdc79eb309f5f6533d6c15ae9f34198835283bd4cbefaa6241dcbb11b161e24d031a912a121e11cba65eb2952e0df5d544c5febec105e272 SHA512 edd96df8ee8035a48876750bd2e380f03e51b58dc4a81e262bad2bf32d8f6dcd8aaf9de94c6d9501782470a7928d378ec239e4880d9583052dd5ca81fb791712 DIST scylla-bin-3.1_p259-python3.tar.gz 29292188 BLAKE2B 169a67b487244b2a391aacc995155a749b0746cfbd342c387423106abda4f361a45a7d5bfbba020e1f32014ead148d5363c4c58bb35eb6147f992b7040ff17c4 SHA512 5883c34c79d8e09ecbefa612c37875383cb4e45d429599a5b0b74a048fd93fc4a672d7b9a2335eb0fefdc05d08edc5a0a72dc2d3fb77485dd1146fd48899936b @@ -17,14 +17,14 @@ MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl5fvw5fFIAAAAAALgAo +iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl5fy/tfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX -dy8YjQf6A4HwWMVSyeGaokQ1zoF4J7DMjrxUiJNtzojc16qEM63aHFsAy5uC9ALI -lKwoXO05GOCF12m7ynClTglYPnP+UKhqthJkO+2sKBHvdVYDHWk0Ufh4FA4j29C9 -Q1KbDKbt0BUwunhMqH1k7nWUaeAhh5Gks3PCO+vfDKjdetaNI/k9kK1ZLj8/5gnI -Kq+TeXnDsMP4ltD5jbkH1H2mWmeOtaFWAcgjrKhvYcrjZ527i+/RDcx+/qqgHlbG -j8BarNQbE/i8BjrjgvjHMwdwKMjmUKbc/X5LtY6bk2EQOhn0zjC85YdNKqyOyNbw -M2BCOXe65ko2gMz2DE4Frmwl/Hx+PQ== -=yQmy +dy+/vwf/YZU26fCIQYMTVsK5GFYz+pWU3bKUPeIDK6aJeRs4I1vx8KpiP1sEJfWl +YaeDklNqhOM2H0PXLhtxYIRohSCUoml6yGeHWbcXHRa/u4mxukecaSt2PKSM2gBz +vR65dz3UOEFCRaGCeR7H/ENxNZnLC93aaMq+kHIUBrDbDT7J2XUaU22Ea7hrp6D7 +wHRb3eiybFJ8gOm7uZUNMNmv3Entv95CNtbkh6hsx49oam6skjh7bGsf1Fyt/3Mq +UvzDu/bkWs80YlJz1edgvw+eHqogUuWD9FTTcOzjUDPSGdYrGcntOSpO6tk+elOD +ew5ncCa8VOwmD5o9/E5wcVvwdOMSPA== +=YHuI -----END PGP SIGNATURE----- diff --git a/dev-db/scylla-bin/files/scylla-server.initd b/dev-db/scylla-bin/files/scylla-server.initd index 1107e40..59caf81 100644 --- a/dev-db/scylla-bin/files/scylla-server.initd +++ b/dev-db/scylla-bin/files/scylla-server.initd @@ -31,9 +31,12 @@ start_pre() { /usr/lib/scylla/scylla_prepare >/dev/null } -stop_post() { +stop_pre() { ebegin "Draining node" - $(which nodetool) drain + $(which nodetool) drain || ewarn "Draining failed!" +} + +stop_post() { ebegin "Running scylla_stop" /usr/lib/scylla/scylla_stop >/dev/null } |