diff options
| author |   Ultrabug <ultrabug@gentoo.org> | 2020-03-04 15:46:02 +0100 |
|---|---|---|
| committer | Ultrabug <ultrabug@gentoo.org> | 2020-03-04 15:46:02 +0100 |
| commit | e315102801df3ced0e0151f509d2c5eeb773b034 (patch) | |
| tree | f38212a0d334f1f42102e10fbd9552c27498cb40 | |
| parent | dev-db/scylla-bin: fix yaml.load on 3.1 (diff) | |
| download | ultrabug-e315102801df3ced0e0151f509d2c5eeb773b034.tar.gz ultrabug-e315102801df3ced0e0151f509d2c5eeb773b034.tar.bz2 ultrabug-e315102801df3ced0e0151f509d2c5eeb773b034.zip | |
dev-db/scylla-bin: drain on stop, add tools as dependency
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 | 22 | ||||
| -rw-r--r-- | dev-db/scylla-bin/files/scylla-server.initd | 2 | ||||
| -rw-r--r-- | dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild | 1 | ||||
| -rw-r--r-- | dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild | 1 |
4 files changed, 15 insertions, 11 deletions
diff --git a/dev-db/scylla-bin/Manifest b/dev-db/scylla-bin/Manifest index 65b3886..474b4ca 100644 --- a/dev-db/scylla-bin/Manifest +++ b/dev-db/scylla-bin/Manifest @@ -5,26 +5,26 @@ 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 1020 BLAKE2B 99aaf3d265b507cbcc36a1cc55b9ac9cabb7f1f04c006a4cdd1dae0484d3ab96fa0b6895da29c96c93a2416f954bf3dbc837a4de2faa28c0549a4656b77a19ee SHA512 27e423779b6092e0bd50008633d9e92351c1ccce3d33801196f3c43565409afee310ac0fe627a6ce04296731075fe81a1104c7dc3ca32e15315fd1df3f943db4 +AUX scylla-server.initd 1069 BLAKE2B 9752275e7a55897b575447c030d7268507e27a81f1b2d17bab03b3e1811e2a279402c73713c90aa6bb4c3de037159687c0cd8a82ce70b82742656317396fe3f0 SHA512 8f73f8945394de71e8360653c6f1f48f746dc11bf39b77849c999b472ed8b4a8f862cf87e8c34711960b502d6746ebf51b28aa421690b1f397bb746321211ccf 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 DIST scylla-bin-3.2_p202002221144-package.tar.gz 1033996280 BLAKE2B 20faa9af84bad4585baef16564fc583bfdfc01a2ea94ffc6e9324fa80b62c625838f46eeeb8a47536c36047640fb68ed738492595c458afb9c2146bdbc070a00 SHA512 f7187c5dd843089a352c607b27efa7ee979dfd10634dc1d5299821ed5d8fa36d65d66f803dd1b5c8addbe6a8e9f7f36ae2d111a86a9e90a2c3514dab4a3435ea DIST scylla-bin-3.2_p202002221144-python3.tar.gz 34258383 BLAKE2B 85d4467448d23ecfeff7319fb478bbc2f24598aaf5380d5a01cb0b8866caf8fa3eb9196cd03fdd79da9147549a868cd6e6259a337bfa848a57981356a5b2cc48 SHA512 87b29858d9b1c63f98548fb796c4811160dcfdc92071e368c81b23d5db6b266a3d9b2f8cd583e99f1545f10425c4bb0dbb895ae5cf8ca97a7b8434d53ed41c17 -EBUILD scylla-bin-3.1_p259.ebuild 3546 BLAKE2B f592fc3a1865ae2bd417e31e497546b71c725682153a3d1b12abfbcc5b4516c67bfa4b8394da9a4d3374c60e41db4726dafdc0f89bd727cac52cc0d2bb50d42f SHA512 d6accb29556785bc82db1627316a7a7e06658b491002ae0157fec25953e4bff2c83e70930a287b1832d251bfdecef5fc3d6787466e5791a9e88b823bb851aaea -EBUILD scylla-bin-3.2_p202002221144.ebuild 3119 BLAKE2B 9ac009d042a3721bbc005e18c5a667e7fd071824fb15b9899b225cc9adcfe12f35afbe1c24f6e28dd128b4215c4dad0026ff2cf859f5a4cc65f3af46b8969045 SHA512 b4863d066304534830f3f951c79845e61345ab57d0f0f327b67693ff22e92c2ff83cc592defacfd33e19ffb54a030e0e62cd4451d8276dbc409291862251dd39 +EBUILD scylla-bin-3.1_p259.ebuild 3576 BLAKE2B c518749676fe53d03aeb42ad7e2523af94bae6aac778f45f69831decde56222dafb8291b7bc7f78361c2003086005a0fd5e61b085f7040b5fea66bbf7e4fc583 SHA512 e2d5801bfa4e8e1231cabe3ef9832f5299ec06209aa077186d4a1022aa8c6bba493691dcc23ac7c81f3244a08b0a10464476a9a05a8c0b1b1b870fd90f030995 +EBUILD scylla-bin-3.2_p202002221144.ebuild 3149 BLAKE2B 31aa2fbb0c57e2481813beb96c384d863014da40b68da3f2d2dba10e980c0c5e1b03d10afd24d7f06a4b41a98eec39528fb31c2d76ffd8ae92fa2689822cb528 SHA512 87468eb7519857586c2948eb7555a427e4a790d8072f9975566f46eff9726edf1d31b2d4f69c7e601022ffaba40939a8ca2a64080471053cbcb03061aa6c1467 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl5fovVfFIAAAAAALgAo +iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl5fvw5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX -dy9cFAf/b+n53mA7nwyiQm7wi4yA12Uu6V2a0E5gJMm55zLO6KpiL/02/0vr+qME -dTty/X9Xy4mqH1FHq4fNijQgeCQt/JW/wMotg6Dg9nqvNkgN/TRzUsgAHRvy8dBD -SwLtfIR5mvjagA9+QnCEsTCXJB2NUlk60e76TEf8xzw0F3xucv5QZFRAzV1zEgiO -JnRXKXO8ieD0ozC7ywI182F0Dx7STUGJm5VcicAKsGXi4rO9mBlKSZ1xZdbIg/cN -yrB713HsasVJnW6OQrY1yeqArzo5LylsnpdeMPk2jr7DBfgF8KevObI0Yi17cVpt -D/wk6kz2ej0woPqenrFy7DtJGIP+Lw== -=n0ij +dy8YjQf6A4HwWMVSyeGaokQ1zoF4J7DMjrxUiJNtzojc16qEM63aHFsAy5uC9ALI +lKwoXO05GOCF12m7ynClTglYPnP+UKhqthJkO+2sKBHvdVYDHWk0Ufh4FA4j29C9 +Q1KbDKbt0BUwunhMqH1k7nWUaeAhh5Gks3PCO+vfDKjdetaNI/k9kK1ZLj8/5gnI +Kq+TeXnDsMP4ltD5jbkH1H2mWmeOtaFWAcgjrKhvYcrjZ527i+/RDcx+/qqgHlbG +j8BarNQbE/i8BjrjgvjHMwdwKMjmUKbc/X5LtY6bk2EQOhn0zjC85YdNKqyOyNbw +M2BCOXe65ko2gMz2DE4Frmwl/Hx+PQ== +=yQmy -----END PGP SIGNATURE----- diff --git a/dev-db/scylla-bin/files/scylla-server.initd b/dev-db/scylla-bin/files/scylla-server.initd index 12aaf1b..1107e40 100644 --- a/dev-db/scylla-bin/files/scylla-server.initd +++ b/dev-db/scylla-bin/files/scylla-server.initd @@ -32,6 +32,8 @@ start_pre() { } stop_post() { + ebegin "Draining node" + $(which nodetool) drain ebegin "Running scylla_stop" /usr/lib/scylla/scylla_stop >/dev/null } diff --git a/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild b/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild index 733bea3..20cb906 100644 --- a/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild +++ b/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild @@ -21,6 +21,7 @@ RDEPEND=" !dev-db/scylla dev-python/pystache >=app-admin/scylla-jmx-3.1 + >=app-admin/scylla-tools-3.1 " DEPEND="${RDEPEND} >=sys-kernel/linux-headers-3.5 diff --git a/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild b/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild index 0f3ed1f..4968dde 100644 --- a/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild +++ b/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild @@ -21,6 +21,7 @@ RDEPEND=" !dev-db/scylla dev-python/pystache >=app-admin/scylla-jmx-3.2 + >=app-admin/scylla-tools-3.2 " DEPEND="${RDEPEND} >=sys-kernel/linux-headers-3.5 |