[From nobody Tue May 26 11:27:18 2026 Received: (at submit) by bugs.debian.org; 29 Nov 2016 01:39:16 +0000 X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02 (2014-02-07) on buxtehude.debian.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=4.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HAS_PACKAGE,MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02 X-Spam-Bayes: score:0.0000 Tokens: new, 34; hammy, 144; neutral, 101; spammy, 6. spammytokens:0.987-1--H*MI:7c21, 0.987-1--H*M:2bdb, 0.987-1--H*M:1c80, 0.987-1--H*MI:1c80, 0.987-1--H*MI:2bdb hammytokens:0.000-+--H*UA:45.0, 0.000-+--H*u:45.0, 0.000-+--systemd, 0.000-+--dfsg12, 0.000-+--dfsg1-2 Return-path: <jagerman@jagerman.com> Received: from mail.imaginary.ca ([2607:5300:60:2c46::1] ident=postfix) by buxtehude.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <jagerman@jagerman.com>) id 1cBXO8-0000hs-FD for submit@bugs.debian.org; Tue, 29 Nov 2016 01:39:16 +0000 Received: from [130.15.75.80] (d80.n75.queensu.ca [130.15.75.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.imaginary.ca (Postfix) with ESMTPSA id 7D9B319B00B for <submit@bugs.debian.org>; Mon, 28 Nov 2016 20:39:11 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jagerman.com; s=mail; t=1480383551; bh=sjrXMYoiCI61herGls1rY6TrfFNBiJxRXXaPmOiUEFo=; h=To:From:Subject:Date:From; b=PY25yvhqnocLDehPFjCt/4KEzJtuF82ofqOQZktQMMS8rscBoVORIsfitMxSibeix xsgWqFOM1Gpd8ACw40yMDu1qtBTHv0sBeAvEfw71jYaDSgwsFjpRjch7L9qf05rNh+ VhaUaz52Q0ZeJPjFQZEcE1U7CwB0z+kb5rZwnvWY= To: submit@bugs.debian.org From: Jason Rhinelander <jagerman@jagerman.com> Subject: gitlab: Use notify on ready under systemd instead of hack with sleep + check commandline Message-ID: <280c88b4-1c80-7c21-2bdb-f773bbb386d2@jagerman.com> Date: Mon, 28 Nov 2016 20:39:11 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.5.0 MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="------------ms010305090403030108080000" X-Virus-Scanned: clamav-milter 0.99.2 at keynes.imaginary.ca X-Virus-Status: Clean Delivered-To: submit@bugs.debian.org This is a cryptographically signed message in MIME format. --------------ms010305090403030108080000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Package: gitlab Version: 8.13.6+dfsg1-2 Severity: normal Dear Maintainer, The current systemd service file for gitlab-sidekiq contains a hack to=20 delay the systemd service startup until sidekiq is actually ready by=20 sleeping for up to 32 seconds (in increments of 4 seconds) until=20 sidekiq's cmdline changes. Besides being an unpleasant hack, and potentially ending too early (e.g. = if sidekiq takes more than 32 seconds to start up on a slow/loaded=20 machine), this also has the unfortunate consequence of showing this=20 command forever in the service status output, and of making the service=20 take up to 4 seconds longer than necessary to actually be registered as=20 started. We can do much better by performing a proper systemd notify, as follows=20 (I've tested this locally, and it works properly): 1. Patch the installed /etc/gitlab/initializers/sidekiq.rb to add, near=20 the top of the configure_server function: if ((socket_path =3D ENV["NOTIFY_SOCKET"])) config.on(:startup) do notify_socket =3D Socket.new(Socket::AF_UNIX, Socket::SOCK_DGRAM, = 0) notify_socket.connect(Socket.sockaddr_un(socket_path)) notify_socket.sendmsg "READY=3D1", Socket::MSG_NOSIGNAL end end 2. change the gitlab-sidekiq.service file to contain: Type=3Dnotify and delete the ExecStartPost=3D line. Then we get proper notification support: notification happens=20 immediately upon sidekiq being ready, the hack is gone, and the job=20 starts faster. Jason Rhinelander --------------ms010305090403030108080000 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCC DGkwggYtMIIFFaADAgECAgMQWC0wDQYJKoZIhvcNAQELBQAwgYwxCzAJBgNVBAYTAklMMRYw FAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZp Y2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJt ZWRpYXRlIENsaWVudCBDQTAeFw0xNTEyMDgxMTAxMzZaFw0xNjEyMDgxMzAyMjJaMEYxHjAc BgNVBAMMFWphZ2VybWFuQGphZ2VybWFuLmNvbTEkMCIGCSqGSIb3DQEJARYVamFnZXJtYW5A amFnZXJtYW4uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2BhUSlx6d6Ij 9cD6Jjyny6Q9NW8qhy/XdrXjdbSu1ueDNitcpZGu9tMEwrO8iNmkt7MK9w0uJXAy4u5sNJ84 OLPkER/t1PYS6HIsO/aDMZ9A5C969zHmJfQ7pqNhbQDp6N/ikuCFlHzebTP/JI3d1eFKEs/v MjMGjZpR4/gWal6M+zjzo+knp0MG0hsaoa4roKg1unZFpitFBq0owfVanDG06Hn+4SbRnW5H 6z/ZyvKr8qvVBeSxAw2M0/xZ/TTjB/Mr8tQE/mautcR+AMUMiXwCx6bSmRWf5GzulecxO+7F aK3y8EptgZ8Ia93Of32n0vawq9q4FVXTB55ooUC1cwIDAQABo4IC2zCCAtcwCQYDVR0TBAIw ADALBgNVHQ8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQW BBREOg+m9oaGfPHByrQmdjAcXtLhITAfBgNVHSMEGDAWgBRTcu2SnODaywFcfH6WNU7y1LhR gjAgBgNVHREEGTAXgRVqYWdlcm1hbkBqYWdlcm1hbi5jb20wggFMBgNVHSAEggFDMIIBPzCC ATsGCysGAQQBgbU3AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5j b20vcG9saWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2NvcmRp bmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0 Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBvc2Ug aW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9ucy4wNgYDVR0f BC8wLTAroCmgJ4YlaHR0cDovL2NybC5zdGFydHNzbC5jb20vY3J0dTEtY3JsLmNybDCBjgYI KwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1 Yi9jbGFzczEvY2xpZW50L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNv bS9jZXJ0cy9zdWIuY2xhc3MxLmNsaWVudC5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBCwUAA4IBAQB2SBQRzHDyZiDj97+VosgOQJMV CSoISPCuwk/YBvSOXMwXbsXYbZUx/BuRc515hi1ruhuMKY0UNMdBQVs+pRylufGVp3jBjaRJ pK/FdEg53Ufewev7jwqyl2uQtdHU0lr7whSJfj4gfR3uYPwSfCcikeqfnrJzGR33LLYWd/gP OxBLQE4CXBQXJZJgqqtr5Rjz7KyqG00CearT6z+yD0RMjkG2PTTPHTsIbnx6yhvTB9UOQMpb A4ERjR5nR1Li8bKjWB0q2RRJpf3Z7Tn4MGR63XXIpTlWHrVqH9KCkkLppddFyrRVYfBa7FXx hja3NpXd0g60vIyU/Z+g1Vysnbd0MIIGNDCCBBygAwIBAgIBHjANBgkqhkiG9w0BAQUFADB9 MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJl IERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlm aWNhdGlvbiBBdXRob3JpdHkwHhcNMDcxMDI0MjEwMTU1WhcNMTcxMDI0MjEwMTU1WjCBjDEL MAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBE aWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEg UHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A MIIBCgKCAQEAxwmDzM4t2BqxKaQuE6uWvooyg4ymiEGWVUet1G8SD+rqvyNH4QrvnEIaFHxO hESip7vMz39ScLpNLbL1QpOlPW/tFIzNHS3qd2XRNYG5Sv9RcGE+T4qbLtsjjJbi6sL7Ls/f /X9ftTyhxvxWkf8KW37iKrueKsxw2HqolH7GM6FX5UfNAwAu4ZifkpmZzU1slBhyWwaQPEPP ZRsWoTb7q8hmgv6Nv3Hg9rmA1/VPBIOQ6SKRkHXG0Hhmq1dOFoAFI411+a/9nWm5rcVjGcIW Z2v/43Yksq60jExipA4l5uv9/+Hm33mbgmCszdj/Dthf13tgAv2O83hLJ0exTqfrlwIDAQAB o4IBrTCCAakwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFNy 7ZKc4NrLAVx8fpY1TvLUuFGCMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQQa7yMGYG CCsGAQUFBwEBBFowWDAnBggrBgEFBQcwAYYbaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL2Nh MC0GCCsGAQUFBzAChiFodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9zZnNjYS5jcnQwWwYDVR0f BFQwUjAnoCWgI4YhaHR0cDovL3d3dy5zdGFydHNzbC5jb20vc2ZzY2EuY3JsMCegJaAjhiFo dHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9zZnNjYS5jcmwwgYAGA1UdIAR5MHcwdQYLKwYBBAGB tTcBAgEwZjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBk ZjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5zdGFydHNzbC5jb20vaW50ZXJtZWRpYXRlLnBk ZjANBgkqhkiG9w0BAQUFAAOCAgEACoMIfXirLAZcuGOMXq4cuSN3TaFx2H2GvD5VSy/6rV55 BYHbWNaPeQn3oBSU8KgQZn/Kck1JxbLpAxVCNtsxeW1R87ifhsYZ0qjdrA9anrW2MAWCtosm AOT4OxK9QPoSjCMxM3HbkZCDJgnlE8jMopH21BbyAYr7b5EfGRQJNtgWcvqSXwKHnTutR08+ Kkn0KAkXCzeQNLeA5LlYUzFyM7kPAp8pIRMQ+seHunmyG642S2+y/qHEdMuGIwpfz3eDF1Pd ctL04qYK/zu+Qg1Bw0RwgigVZs/0c5HP2/e9DBHh7eSwtzYlk4AUr6yxLlcwSjOfOmKEQ/Q8 tzh0IFiNu9IPuTGAPBn4CPxD0+Ru8T2wg8/s43R/PT3kd1OEqOJUl7q+h+r6fpvU0Fzxd2tC 8Ga6fDEPme+1Nbi+03pVjuZQKbGwKJ66gEn06WqaxVZC+J8hh/jR0k9mST1iAZPNYulcNJ8t KmVtjYsv0L1TSm2+NwON58tO+pIVzu3DWwSEXSf+qkDavQam+QtEOZxLBXI++aMUEapSn+k3 Lxm48ZCYfAWLb/Xj7F5JQMbZvCexglAbYR0kIHqW5DnsYSdMD/IplJMojx0NBrxJ3fN9dvX2 Y6BIXRsF1du4qESm4/3CKuyUV7p9DW3mPlHTGLvYxnyKQy7VFBkoLINszBrOUeIxggPtMIID 6QIBATCBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNV BAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0 Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBAgMQWC0wDQYJYIZI AWUDBAIBBQCgggIpMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8X DTE2MTEyOTAxMzkxMVowLwYJKoZIhvcNAQkEMSIEIIZtTm8cmKZkg2DQTOnKwbHda0+SUkf7 +5KYddjNfwmnMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwgaUGCSsGAQQBgjcQBDGBlzCBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNV BAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRl IFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlh dGUgQ2xpZW50IENBAgMQWC0wgacGCyqGSIb3DQEJEAILMYGXoIGUMIGMMQswCQYDVQQGEwJJ TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2Vy dGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IElu dGVybWVkaWF0ZSBDbGllbnQgQ0ECAxBYLTANBgkqhkiG9w0BAQEFAASCAQAuy1hFL6pmzZ9L pIBN4gDn6aIlv6dAdrhWekVpPcfsykR3cpxAKy2hA0Ty9VlxDDWjcxGp1f6GzHb+KAL3Nxqy q/M/6Ipl6XTML15uQzRnyo1Lhdfi1tltU7Qua+55Bopl0AzMtxOSC8+9GXlpqVaZOOuy31XK RG4seIvd6bg9X95YSx6bW+yR675QmVBSF/m8pQbsyUNBBlEbFQVI+mllcRt3BSbFubN7/iPR gdN/MJTFtKsb7Au1Hkc5yMGf4E0HG7bRJ6QZIP7cj5nAU67p8De4wTjG14JSkdq0ISTr2DJp XRYD74ncF3ouns+w+S7ZXSyR8865/gDxoZjI52e6AAAAAAAA --------------ms010305090403030108080000-- ]