{"action":"created","comment":{"url":"https://api.github.com/repos/coreos/etcd/pulls/comments/25104060","id":25104060,"diff_hunk":"@@ -15,158 +15,169 @@\n package rafthttp\n \n import (\n-\t\"errors\"\n+\t\"log\"\n \t\"net/http\"\n-\t\"sync\"\n \t\"time\"\n \n+\t\"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context\"\n \t\"github.com/coreos/etcd/etcdserver/stats\"\n \t\"github.com/coreos/etcd/pkg/types\"\n \t\"github.com/coreos/etcd/raft/raftpb\"\n )\n \n const (\n-\tappRespBatchMs = 50\n-\tpropBatchMs    = 10\n-\n+\tDialTimeout      = time.Second\n \tConnReadTimeout  = 5 * time.Second\n \tConnWriteTimeout = 5 * time.Second\n+\n+\trecvBufSize = 4096\n )\n \n type peer struct {\n-\tsync.Mutex\n-\n-\tid  types.ID\n-\tcid types.ID\n-\n-\ttr http.RoundTripper\n-\t// the url this sender post to\n-\tu  string\n-\tr  Raft\n-\tfs *stats.FollowerStats\n-\n-\tbatcher     *Batcher\n-\tpropBatcher *ProposalBatcher\n+\tid types.ID\n+\n+\tmsgAppWriter *streamWriter\n+\twriter       *streamWriter\n+\tpipeline     *pipeline\n+\n+\tsendc   chan raftpb.Message\n+\trecvc   chan raftpb.Message\n+\tnewURLc chan string\n+\tpausec  chan struct{}\n+\tresumec chan struct{}\n+\tstopc   chan struct{}\n+\tdone    chan struct{}\n+}\n \n-\tpipeline *pipeline\n-\tstream   *stream\n+func startPeer(tr http.RoundTripper, u string, local, to, cid types.ID, r Raft, fs *stats.FollowerStats, errorc chan error) *peer {\n+\tp := &peer{\n+\t\tid:           to,\n+\t\tmsgAppWriter: startStreamWriter(fs),\n+\t\twriter:       startStreamWriter(fs),\n+\t\tpipeline:     newPipeline(tr, u, to, cid, fs, errorc),\n+\t\tsendc:        make(chan raftpb.Message),\n+\t\trecvc:        make(chan raftpb.Message, recvBufSize),\n+\t\tnewURLc:      make(chan string),\n+\t\tpausec:       make(chan struct{}),\n+\t\tresumec:      make(chan struct{}),\n+\t\tstopc:        make(chan struct{}),\n+\t\tdone:         make(chan struct{}),\n+\t}\n+\tgo func() {\n+\t\tmsgAppReader := startStreamReader(tr, u, streamTypeMsgApp, local, to, cid, p.recvc)\n+\t\treader := startStreamReader(tr, u, streamTypeGeneral, local, to, cid, p.recvc)\n+\t\tvar paused bool\n+\n+\t\t// non-blocking run loop\n+\t\tfor {\n+\t\t\tselect {\n+\t\t\tcase m := <-p.sendc:\n+\t\t\t\tif paused {\n+\t\t\t\t\tcontinue\n+\t\t\t\t}\n+\t\t\t\twritec, name, size := p.pick(m)","path":"rafthttp/peer.go","position":84,"original_position":84,"commit_id":"02daf3d49e7b8eb848aa33025f37d32530e200f3","original_commit_id":"02daf3d49e7b8eb848aa33025f37d32530e200f3","user":{"login":"xiang90","id":4479947,"avatar_url":"https://avatars.githubusercontent.com/u/4479947?v=3","gravatar_id":"","url":"https://api.github.com/users/xiang90","html_url":"https://github.com/xiang90","followers_url":"https://api.github.com/users/xiang90/followers","following_url":"https://api.github.com/users/xiang90/following{/other_user}","gists_url":"https://api.github.com/users/xiang90/gists{/gist_id}","starred_url":"https://api.github.com/users/xiang90/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xiang90/subscriptions","organizations_url":"https://api.github.com/users/xiang90/orgs","repos_url":"https://api.github.com/users/xiang90/repos","events_url":"https://api.github.com/users/xiang90/events{/privacy}","received_events_url":"https://api.github.com/users/xiang90/received_events","type":"User","site_admin":false},"body":"i am thinking if we can return something better. not big issue","created_at":"2015-02-20T21:21:40Z","updated_at":"2015-02-20T21:21:40Z","html_url":"https://github.com/coreos/etcd/pull/2323#discussion_r25104060","pull_request_url":"https://api.github.com/repos/coreos/etcd/pulls/2323","_links":{"self":{"href":"https://api.github.com/repos/coreos/etcd/pulls/comments/25104060"},"html":{"href":"https://github.com/coreos/etcd/pull/2323#discussion_r25104060"},"pull_request":{"href":"https://api.github.com/repos/coreos/etcd/pulls/2323"}}},"pull_request":{"url":"https://api.github.com/repos/coreos/etcd/pulls/2323","id":29402901,"html_url":"https://github.com/coreos/etcd/pull/2323","diff_url":"https://github.com/coreos/etcd/pull/2323.diff","patch_url":"https://github.com/coreos/etcd/pull/2323.patch","issue_url":"https://api.github.com/repos/coreos/etcd/issues/2323","number":2323,"state":"open","locked":false,"title":"rafthttp: refactor peer","user":{"login":"yichengq","id":2976232,"avatar_url":"https://avatars.githubusercontent.com/u/2976232?v=3","gravatar_id":"","url":"https://api.github.com/users/yichengq","html_url":"https://github.com/yichengq","followers_url":"https://api.github.com/users/yichengq/followers","following_url":"https://api.github.com/users/yichengq/following{/other_user}","gists_url":"https://api.github.com/users/yichengq/gists{/gist_id}","starred_url":"https://api.github.com/users/yichengq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yichengq/subscriptions","organizations_url":"https://api.github.com/users/yichengq/orgs","repos_url":"https://api.github.com/users/yichengq/repos","events_url":"https://api.github.com/users/yichengq/events{/privacy}","received_events_url":"https://api.github.com/users/yichengq/received_events","type":"User","site_admin":false},"body":"Architecture:\r\nEach peer manages three worker:\r\nmsgApp stream: receive/send entries of msgApp fast\r\ngeneral stream: receive/send all other messages fast\r\npipeline: the safest but slowest way to receive/send messages\r\n\r\nPerformance:\r\nEnvironment: MacBook Pro (Retina, 15-inch, Mid 2014), 3-member cluster, 200 clients\r\npropose to leader: 7245 req/s\r\npropose to follower: 1963 req/s\r\n\r\nFeedback is welcome.\r\n\r\nKeep working:\r\n- [x] fix tests\r\n- [ ] add tests\r\n\r\nFurther thoughts:\r\n1. more specific-usage streams can make it faster and more stable\r\n2. the speed that propose to follower is restricted heavily because we don't recover CommitIndex in msgApp stream","created_at":"2015-02-16T21:49:20Z","updated_at":"2015-02-20T21:21:40Z","closed_at":null,"merged_at":null,"merge_commit_sha":"4833ea24db442410f2559114d6440c949b9b3648","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/coreos/etcd/pulls/2323/commits","review_comments_url":"https://api.github.com/repos/coreos/etcd/pulls/2323/comments","review_comment_url":"https://api.github.com/repos/coreos/etcd/pulls/comments/{number}","comments_url":"https://api.github.com/repos/coreos/etcd/issues/2323/comments","statuses_url":"https://api.github.com/repos/coreos/etcd/statuses/02daf3d49e7b8eb848aa33025f37d32530e200f3","head":{"label":"yichengq:320","ref":"320","sha":"02daf3d49e7b8eb848aa33025f37d32530e200f3","user":{"login":"yichengq","id":2976232,"avatar_url":"https://avatars.githubusercontent.com/u/2976232?v=3","gravatar_id":"","url":"https://api.github.com/users/yichengq","html_url":"https://github.com/yichengq","followers_url":"https://api.github.com/users/yichengq/followers","following_url":"https://api.github.com/users/yichengq/following{/other_user}","gists_url":"https://api.github.com/users/yichengq/gists{/gist_id}","starred_url":"https://api.github.com/users/yichengq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yichengq/subscriptions","organizations_url":"https://api.github.com/users/yichengq/orgs","repos_url":"https://api.github.com/users/yichengq/repos","events_url":"https://api.github.com/users/yichengq/events{/privacy}","received_events_url":"https://api.github.com/users/yichengq/received_events","type":"User","site_admin":false},"repo":{"id":16744058,"name":"etcd","full_name":"yichengq/etcd","owner":{"login":"yichengq","id":2976232,"avatar_url":"https://avatars.githubusercontent.com/u/2976232?v=3","gravatar_id":"","url":"https://api.github.com/users/yichengq","html_url":"https://github.com/yichengq","followers_url":"https://api.github.com/users/yichengq/followers","following_url":"https://api.github.com/users/yichengq/following{/other_user}","gists_url":"https://api.github.com/users/yichengq/gists{/gist_id}","starred_url":"https://api.github.com/users/yichengq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yichengq/subscriptions","organizations_url":"https://api.github.com/users/yichengq/orgs","repos_url":"https://api.github.com/users/yichengq/repos","events_url":"https://api.github.com/users/yichengq/events{/privacy}","received_events_url":"https://api.github.com/users/yichengq/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/yichengq/etcd","description":"A highly-available key value store for shared configuration and service discovery","fork":true,"url":"https://api.github.com/repos/yichengq/etcd","forks_url":"https://api.github.com/repos/yichengq/etcd/forks","keys_url":"https://api.github.com/repos/yichengq/etcd/keys{/key_id}","collaborators_url":"https://api.github.com/repos/yichengq/etcd/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/yichengq/etcd/teams","hooks_url":"https://api.github.com/repos/yichengq/etcd/hooks","issue_events_url":"https://api.github.com/repos/yichengq/etcd/issues/events{/number}","events_url":"https://api.github.com/repos/yichengq/etcd/events","assignees_url":"https://api.github.com/repos/yichengq/etcd/assignees{/user}","branches_url":"https://api.github.com/repos/yichengq/etcd/branches{/branch}","tags_url":"https://api.github.com/repos/yichengq/etcd/tags","blobs_url":"https://api.github.com/repos/yichengq/etcd/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/yichengq/etcd/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/yichengq/etcd/git/refs{/sha}","trees_url":"https://api.github.com/repos/yichengq/etcd/git/trees{/sha}","statuses_url":"https://api.github.com/repos/yichengq/etcd/statuses/{sha}","languages_url":"https://api.github.com/repos/yichengq/etcd/languages","stargazers_url":"https://api.github.com/repos/yichengq/etcd/stargazers","contributors_url":"https://api.github.com/repos/yichengq/etcd/contributors","subscribers_url":"https://api.github.com/repos/yichengq/etcd/subscribers","subscription_url":"https://api.github.com/repos/yichengq/etcd/subscription","commits_url":"https://api.github.com/repos/yichengq/etcd/commits{/sha}","git_commits_url":"https://api.github.com/repos/yichengq/etcd/git/commits{/sha}","comments_url":"https://api.github.com/repos/yichengq/etcd/comments{/number}","issue_comment_url":"https://api.github.com/repos/yichengq/etcd/issues/comments/{number}","contents_url":"https://api.github.com/repos/yichengq/etcd/contents/{+path}","compare_url":"https://api.github.com/repos/yichengq/etcd/compare/{base}...{head}","merges_url":"https://api.github.com/repos/yichengq/etcd/merges","archive_url":"https://api.github.com/repos/yichengq/etcd/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/yichengq/etcd/downloads","issues_url":"https://api.github.com/repos/yichengq/etcd/issues{/number}","pulls_url":"https://api.github.com/repos/yichengq/etcd/pulls{/number}","milestones_url":"https://api.github.com/repos/yichengq/etcd/milestones{/number}","notifications_url":"https://api.github.com/repos/yichengq/etcd/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/yichengq/etcd/labels{/name}","releases_url":"https://api.github.com/repos/yichengq/etcd/releases{/id}","created_at":"2014-02-11T20:18:23Z","updated_at":"2015-02-12T19:42:08Z","pushed_at":"2015-02-20T18:21:34Z","git_url":"git://github.com/yichengq/etcd.git","ssh_url":"git@github.com:yichengq/etcd.git","clone_url":"https://github.com/yichengq/etcd.git","svn_url":"https://github.com/yichengq/etcd","homepage":"","size":17186,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"coreos:210","ref":"210","sha":"676ba5b606a5514752399f65561476b39e15daa4","user":{"login":"coreos","id":3730757,"avatar_url":"https://avatars.githubusercontent.com/u/3730757?v=3","gravatar_id":"","url":"https://api.github.com/users/coreos","html_url":"https://github.com/coreos","followers_url":"https://api.github.com/users/coreos/followers","following_url":"https://api.github.com/users/coreos/following{/other_user}","gists_url":"https://api.github.com/users/coreos/gists{/gist_id}","starred_url":"https://api.github.com/users/coreos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/coreos/subscriptions","organizations_url":"https://api.github.com/users/coreos/orgs","repos_url":"https://api.github.com/users/coreos/repos","events_url":"https://api.github.com/users/coreos/events{/privacy}","received_events_url":"https://api.github.com/users/coreos/received_events","type":"Organization","site_admin":false},"repo":{"id":11225014,"name":"etcd","full_name":"coreos/etcd","owner":{"login":"coreos","id":3730757,"avatar_url":"https://avatars.githubusercontent.com/u/3730757?v=3","gravatar_id":"","url":"https://api.github.com/users/coreos","html_url":"https://github.com/coreos","followers_url":"https://api.github.com/users/coreos/followers","following_url":"https://api.github.com/users/coreos/following{/other_user}","gists_url":"https://api.github.com/users/coreos/gists{/gist_id}","starred_url":"https://api.github.com/users/coreos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/coreos/subscriptions","organizations_url":"https://api.github.com/users/coreos/orgs","repos_url":"https://api.github.com/users/coreos/repos","events_url":"https://api.github.com/users/coreos/events{/privacy}","received_events_url":"https://api.github.com/users/coreos/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/coreos/etcd","description":"A highly-available key value store for shared configuration and service discovery","fork":false,"url":"https://api.github.com/repos/coreos/etcd","forks_url":"https://api.github.com/repos/coreos/etcd/forks","keys_url":"https://api.github.com/repos/coreos/etcd/keys{/key_id}","collaborators_url":"https://api.github.com/repos/coreos/etcd/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/coreos/etcd/teams","hooks_url":"https://api.github.com/repos/coreos/etcd/hooks","issue_events_url":"https://api.github.com/repos/coreos/etcd/issues/events{/number}","events_url":"https://api.github.com/repos/coreos/etcd/events","assignees_url":"https://api.github.com/repos/coreos/etcd/assignees{/user}","branches_url":"https://api.github.com/repos/coreos/etcd/branches{/branch}","tags_url":"https://api.github.com/repos/coreos/etcd/tags","blobs_url":"https://api.github.com/repos/coreos/etcd/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/coreos/etcd/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/coreos/etcd/git/refs{/sha}","trees_url":"https://api.github.com/repos/coreos/etcd/git/trees{/sha}","statuses_url":"https://api.github.com/repos/coreos/etcd/statuses/{sha}","languages_url":"https://api.github.com/repos/coreos/etcd/languages","stargazers_url":"https://api.github.com/repos/coreos/etcd/stargazers","contributors_url":"https://api.github.com/repos/coreos/etcd/contributors","subscribers_url":"https://api.github.com/repos/coreos/etcd/subscribers","subscription_url":"https://api.github.com/repos/coreos/etcd/subscription","commits_url":"https://api.github.com/repos/coreos/etcd/commits{/sha}","git_commits_url":"https://api.github.com/repos/coreos/etcd/git/commits{/sha}","comments_url":"https://api.github.com/repos/coreos/etcd/comments{/number}","issue_comment_url":"https://api.github.com/repos/coreos/etcd/issues/comments/{number}","contents_url":"https://api.github.com/repos/coreos/etcd/contents/{+path}","compare_url":"https://api.github.com/repos/coreos/etcd/compare/{base}...{head}","merges_url":"https://api.github.com/repos/coreos/etcd/merges","archive_url":"https://api.github.com/repos/coreos/etcd/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/coreos/etcd/downloads","issues_url":"https://api.github.com/repos/coreos/etcd/issues{/number}","pulls_url":"https://api.github.com/repos/coreos/etcd/pulls{/number}","milestones_url":"https://api.github.com/repos/coreos/etcd/milestones{/number}","notifications_url":"https://api.github.com/repos/coreos/etcd/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/coreos/etcd/labels{/name}","releases_url":"https://api.github.com/repos/coreos/etcd/releases{/id}","created_at":"2013-07-06T21:57:21Z","updated_at":"2015-02-20T19:07:56Z","pushed_at":"2015-02-20T19:07:56Z","git_url":"git://github.com/coreos/etcd.git","ssh_url":"git@github.com:coreos/etcd.git","clone_url":"https://github.com/coreos/etcd.git","svn_url":"https://github.com/coreos/etcd","homepage":"","size":28891,"stargazers_count":5681,"watchers_count":5681,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":668,"mirror_url":null,"open_issues_count":120,"forks":668,"open_issues":120,"watchers":5681,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/coreos/etcd/pulls/2323"},"html":{"href":"https://github.com/coreos/etcd/pull/2323"},"issue":{"href":"https://api.github.com/repos/coreos/etcd/issues/2323"},"comments":{"href":"https://api.github.com/repos/coreos/etcd/issues/2323/comments"},"review_comments":{"href":"https://api.github.com/repos/coreos/etcd/pulls/2323/comments"},"review_comment":{"href":"https://api.github.com/repos/coreos/etcd/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/coreos/etcd/pulls/2323/commits"},"statuses":{"href":"https://api.github.com/repos/coreos/etcd/statuses/02daf3d49e7b8eb848aa33025f37d32530e200f3"}}}}