diff --git a/cmd/proxy/proxy.go b/cmd/proxy/proxy.go index 29ff5d2f1..5894fc87d 100644 --- a/cmd/proxy/proxy.go +++ b/cmd/proxy/proxy.go @@ -56,6 +56,10 @@ type config struct { stopListening bool logLevel string debug bool + + keepAliveIdle int + keepAliveCount int + keepAliveInterval int } var cfg config @@ -73,6 +77,9 @@ func init() { cmdProxy.PersistentFlags().BoolVar(&cfg.stopListening, "stop-listening", true, "stop listening on store error") cmdProxy.PersistentFlags().StringVar(&cfg.logLevel, "log-level", "info", "debug, info (default), warn or error") cmdProxy.PersistentFlags().BoolVar(&cfg.debug, "debug", false, "enable debug logging") + cmdProxy.PersistentFlags().IntVar(&cfg.keepAliveIdle, "tcp-keepalive-idle", 0, "set tcp keepalive idle (seconds)") + cmdProxy.PersistentFlags().IntVar(&cfg.keepAliveCount, "tcp-keepalive-count", 0, "set tcp keepalive probe count number") + cmdProxy.PersistentFlags().IntVar(&cfg.keepAliveInterval, "tcp-keepalive-interval", 0, "set tcp keepalive interval (seconds)") cmdProxy.PersistentFlags().MarkDeprecated("debug", "use --log-level=debug instead") } @@ -155,6 +162,11 @@ func (c *ClusterChecker) startPollonProxy() error { if err != nil { return fmt.Errorf("error creating pollon proxy: %v", err) } + pp.SetKeepAlive(true) + pp.SetKeepAliveIdle(time.Duration(cfg.keepAliveIdle) * time.Second) + pp.SetKeepAliveCount(cfg.keepAliveCount) + pp.SetKeepAliveInterval(time.Duration(cfg.keepAliveInterval) * time.Second) + c.pp = pp c.listener = listener @@ -366,6 +378,15 @@ func proxy(cmd *cobra.Command, args []string) { if cfg.storeBackend == "" { die("store backend type required") } + if cfg.keepAliveIdle < 0 { + die("tcp keepalive idle value must be greater or equal to 0") + } + if cfg.keepAliveCount < 0 { + die("tcp keepalive idle value must be greater or equal to 0") + } + if cfg.keepAliveInterval < 0 { + die("tcp keepalive idle value must be greater or equal to 0") + } uid := common.UID() log.Infow("proxy uid", "uid", uid) diff --git a/glide.lock b/glide.lock index a850b7c35..ea453f5cb 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: b41517a5f41d92e8eef396e212e6a04c3ffb3218cdb4b8d393394fac8603e7ae -updated: 2017-07-04T17:29:30.314317672+02:00 +hash: 4fd509083e97727c4b09d5e4082f82bdb8e7dcdc607d7c49e019ee967c5802b4 +updated: 2017-09-21T17:59:18.467613065+02:00 imports: - name: github.com/coreos/etcd version: bc9ddf260115d2680191c46977ae72b837785472 @@ -50,13 +50,15 @@ imports: - name: github.com/mitchellh/copystructure version: 5af94aef99f597e6a9e1f6ac6be6ce0f3c96b49d - name: github.com/mitchellh/reflectwalk - version: 8d802ff4ae93611b807597f639c19f76074df5c6 + version: 63d60e9d0dbc60cf9164e6510889b0db6683d98c - name: github.com/satori/go.uuid version: 879c5887cd475cd7864858769793b2ceb0d44feb - name: github.com/sgotti/gexpect version: 0afc6c19f50a08b5f97f8c75f4b417f496d92377 - name: github.com/sorintlab/pollon - version: 279eb94a1432a0656f6da72d36f133dc68c2e064 + version: 1213dda9f770439e1f0dc2dc30635de368d55619 +- name: github.com/sorintlab/tcpkeepalive + version: 320015f34cc6453bd18f5a23b003a88fd88359a2 - name: github.com/spf13/cobra version: 9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744 - name: github.com/spf13/pflag diff --git a/glide.yaml b/glide.yaml index e7a17cf28..51ddeee44 100644 --- a/glide.yaml +++ b/glide.yaml @@ -23,7 +23,7 @@ import: - package: github.com/sgotti/gexpect version: 0afc6c19f50a08b5f97f8c75f4b417f496d92377 - package: github.com/sorintlab/pollon - version: 279eb94a1432a0656f6da72d36f133dc68c2e064 + version: 1213dda9f770439e1f0dc2dc30635de368d55619 - package: github.com/spf13/cobra version: 9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744 - package: github.com/spf13/pflag diff --git a/vendor/github.com/mitchellh/reflectwalk/location_string.go b/vendor/github.com/mitchellh/reflectwalk/location_string.go index d3cfe8545..70760cf4c 100644 --- a/vendor/github.com/mitchellh/reflectwalk/location_string.go +++ b/vendor/github.com/mitchellh/reflectwalk/location_string.go @@ -1,15 +1,15 @@ -// generated by stringer -type=Location location.go; DO NOT EDIT +// Code generated by "stringer -type=Location location.go"; DO NOT EDIT. package reflectwalk import "fmt" -const _Location_name = "NoneMapMapKeyMapValueSliceSliceElemStructStructFieldWalkLoc" +const _Location_name = "NoneMapMapKeyMapValueSliceSliceElemArrayArrayElemStructStructFieldWalkLoc" -var _Location_index = [...]uint8{0, 4, 7, 13, 21, 26, 35, 41, 52, 59} +var _Location_index = [...]uint8{0, 4, 7, 13, 21, 26, 35, 40, 49, 55, 66, 73} func (i Location) String() string { - if i+1 >= Location(len(_Location_index)) { + if i >= Location(len(_Location_index)-1) { return fmt.Sprintf("Location(%d)", i) } return _Location_name[_Location_index[i]:_Location_index[i+1]] diff --git a/vendor/github.com/sorintlab/pollon/pollon.go b/vendor/github.com/sorintlab/pollon/pollon.go index 5f34dcfb5..0fd9950f3 100644 --- a/vendor/github.com/sorintlab/pollon/pollon.go +++ b/vendor/github.com/sorintlab/pollon/pollon.go @@ -19,6 +19,7 @@ import ( "io" "net" "sync" + "time" ) type ConfData struct { @@ -34,6 +35,11 @@ type Proxy struct { stop chan struct{} endCh chan error connMutex sync.Mutex + + keepAlive bool + keepAliveIdle time.Duration + keepAliveCount int + keepAliveInterval time.Duration } func NewProxy(listener *net.TCPListener) (*Proxy, error) { @@ -134,6 +140,12 @@ func (p *Proxy) accepter() { p.endCh <- fmt.Errorf("accept error: %v", err) return } + if p.keepAlive { + if err := p.SetupKeepAlive(conn); err != nil { + p.endCh <- fmt.Errorf("setKeepAlive error: %v", err) + return + } + } go p.proxyConn(conn) } } @@ -152,3 +164,19 @@ func (p *Proxy) Start() error { } return nil } + +func (p *Proxy) SetKeepAlive(keepalive bool) { + p.keepAlive = keepalive +} + +func (p *Proxy) SetKeepAliveIdle(d time.Duration) { + p.keepAliveIdle = d +} + +func (p *Proxy) SetKeepAliveCount(n int) { + p.keepAliveCount = n +} + +func (p *Proxy) SetKeepAliveInterval(d time.Duration) { + p.keepAliveInterval = d +} diff --git a/vendor/github.com/sorintlab/pollon/tcpkeepalive.go b/vendor/github.com/sorintlab/pollon/tcpkeepalive.go new file mode 100644 index 000000000..4d32bc7a1 --- /dev/null +++ b/vendor/github.com/sorintlab/pollon/tcpkeepalive.go @@ -0,0 +1,31 @@ +// +build go1.9 + +package pollon + +import ( + "net" + + "github.com/sorintlab/tcpkeepalive" +) + +func (p *Proxy) SetupKeepAlive(conn *net.TCPConn) error { + if err := conn.SetKeepAlive(true); err != nil { + return err + } + if p.keepAliveIdle != 0 { + if err := tcpkeepalive.SetKeepAliveIdle(conn, p.keepAliveIdle); err != nil { + return err + } + } + if p.keepAliveCount != 0 { + if err := tcpkeepalive.SetKeepAliveCount(conn, p.keepAliveCount); err != nil { + return err + } + } + if p.keepAliveInterval != 0 { + if err := tcpkeepalive.SetKeepAliveInterval(conn, p.keepAliveInterval); err != nil { + return err + } + } + return nil +} diff --git a/vendor/github.com/sorintlab/pollon/tcpkeepalive_go18.go b/vendor/github.com/sorintlab/pollon/tcpkeepalive_go18.go new file mode 100644 index 000000000..289c0376a --- /dev/null +++ b/vendor/github.com/sorintlab/pollon/tcpkeepalive_go18.go @@ -0,0 +1,14 @@ +// +build go1.8,!go1.9 + +package pollon + +import "net" + +func (p *Proxy) SetupKeepAlive(conn *net.TCPConn) error { + if err := conn.SetKeepAlive(true); err != nil { + return err + } + // ignore fine grained keepalive parameters since they are not supported + + return nil +} diff --git a/vendor/github.com/sorintlab/tcpkeepalive/LICENSE b/vendor/github.com/sorintlab/tcpkeepalive/LICENSE new file mode 100644 index 000000000..e06d20818 --- /dev/null +++ b/vendor/github.com/sorintlab/tcpkeepalive/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/vendor/github.com/sorintlab/tcpkeepalive/tcpkeepalive.go b/vendor/github.com/sorintlab/tcpkeepalive/tcpkeepalive.go new file mode 100644 index 000000000..542ecefe8 --- /dev/null +++ b/vendor/github.com/sorintlab/tcpkeepalive/tcpkeepalive.go @@ -0,0 +1,46 @@ +// +build go1.9 + +package tcpkeepalive + +import ( + "net" + "time" +) + +// SetKeepAliveIdle sets the time the connection must be idle before keepalive +// probes are sent. +func SetKeepAliveIdle(c *net.TCPConn, d time.Duration) error { + return control(c, func(fd uintptr) error { + return setIdle(fd, d) + }) +} + +// SetKeepAliveCount sets the number of keepalive probes without an acknowledge +// TCP should send before dropping the connection. +func SetKeepAliveCount(c *net.TCPConn, n int) error { + return control(c, func(fd uintptr) error { + return setCount(fd, n) + }) +} + +// SetKeepAliveInterval sets the time between keepalive probes. +func SetKeepAliveInterval(c *net.TCPConn, d time.Duration) error { + return control(c, func(fd uintptr) error { + return setInterval(fd, d) + }) +} + +func control(c *net.TCPConn, f func(fd uintptr) error) error { + rc, err := c.SyscallConn() + if err != nil { + return err + } + var operr error + err = rc.Control(func(fd uintptr) { + operr = f(fd) + }) + if err != nil { + return err + } + return operr +} diff --git a/vendor/github.com/sorintlab/tcpkeepalive/tcpkeepalive_linux.go b/vendor/github.com/sorintlab/tcpkeepalive/tcpkeepalive_linux.go new file mode 100644 index 000000000..877413beb --- /dev/null +++ b/vendor/github.com/sorintlab/tcpkeepalive/tcpkeepalive_linux.go @@ -0,0 +1,25 @@ +package tcpkeepalive + +import ( + "os" + "syscall" + "time" +) + +func setIdle(fd uintptr, d time.Duration) error { + // The kernel expects seconds so round to next highest second. + d += (time.Second - time.Nanosecond) + secs := int(d.Seconds()) + return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, syscall.TCP_KEEPIDLE, secs)) +} + +func setCount(fd uintptr, n int) error { + return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, syscall.TCP_KEEPCNT, n)) +} + +func setInterval(fd uintptr, d time.Duration) error { + // The kernel expects seconds so round to next highest second. + d += (time.Second - time.Nanosecond) + secs := int(d.Seconds()) + return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, syscall.TCP_KEEPINTVL, secs)) +}