Commit graph

3405 commits

Author SHA1 Message Date
Matt Jaffee
41bdfceb57
remove MemberSet from cluster, Open in server package 2018-06-27 07:22:32 -05:00
Matt Jaffee
c312bc1316
simplify arguments to NewGossipMemberSet 2018-06-27 07:18:16 -05:00
Matt Jaffee
7153499c6a
Merge branch 'develop' into extracting-memberset 2018-06-27 06:58:33 -05:00
Yuce Tekol
ec6fa268c7
Merge pull request #1390 from yuce/update-getting-started
Updated getting started section for latest develop
2018-06-27 01:52:14 +03:00
Yuce Tekol
345165e7df
Merge branch 'develop' into update-getting-started 2018-06-27 01:16:05 +03:00
Yuce Tekol
ffaddb7e41
Merge branch 'develop' into update-getting-started 2018-06-27 01:15:35 +03:00
Matt Jaffee
bcb6942c80
continue simplifying memberset and pilosa setup
since the gossip MemberSet has access to Server, it wasn't really necessary to
pass it a Node object when calling Open on it from Cluster. The end goal is to
have it be removed from Cluster entirely, and have it be Opened externally, and
this is a step toward that.

Exposing Node method on Server doesn't really expose any more than was already
there as the same info can be gotten from LocalStatus with a bit of type
casting. I figured adding the method was a little cleaner, and we could collapse
all the functionality when the dust has settled.

The Cluster.open method has been broken into two parts - one of which happens
earlier (at NewServer time), and the other will eventually just be "waiting to
make sure we've joined the cluster". Right now it's calling Memberset.Open, and
then waiting to make sure the cluster has been joined.
2018-06-26 14:36:05 -05:00
Matthew Jaffee
a5f9236f3a
Merge pull request #1410 from pilosa/fix-translate-merged
Fix translate merged
2018-06-26 13:11:35 -05:00
Matt Jaffee
d9b4cfacb0
Merge branch 'develop' into fix-translate-merged 2018-06-26 12:51:41 -05:00
Matthew Jaffee
83405b3d38
Merge pull request #1412 from jaffee/simplify-event-receiver
consolidate gossipEventReceiver into gossip member set
2018-06-26 12:50:00 -05:00
Matt Jaffee
3314a0372c
Merge branch 'develop' into simplify-event-receiver 2018-06-26 11:45:14 -05:00
Matthew Jaffee
6e89abb8ed
Merge pull request #1413 from codysoyland/command-server-opts
Add CommandOptions and use OptCommandServerOptions to inject mock TranslateStore
2018-06-26 11:44:49 -05:00
Cody Soyland
2fa20197a5
Merge branch 'develop' into command-server-opts 2018-06-26 11:32:41 -05:00
Matt Jaffee
7190fe71e5
fix comment 2018-06-26 11:23:31 -05:00
Cody Soyland
533de70cbd Allow passing slice of CommandOptions to MustRunMainWithCluster, each slice going to one Command 2018-06-26 11:22:48 -05:00
Cody Soyland
e448d47004 Store commandOptions on test.Main for use in Reopen(); unexport serverOptions 2018-06-26 08:47:31 -05:00
Matt Jaffee
c75c52d54b
Merge branch 'develop' into fix-translate-merged 2018-06-26 07:53:31 -05:00
Matt Jaffee
ee37152cd5
consolidate gossipEventReceiver into gossip member set
pilosa.Server now implements StatusHandler and EventReceiver and needs only
start a gossip memberset. A gossip member set now takes a server as an argument
explicitly and the maze of handlers and receivers and the starting sequence is
somewhat simplified.

Server now trivially implements EventHandler by passing the call along to its
Cluster object which has the actual implementation. This means that less things
will need to refer to cluster.
2018-06-26 07:50:33 -05:00
Matthew Jaffee
e667aede06
Merge pull request #1415 from pilosa/1414-frame-dash
allow dashes in frame names
2018-06-26 07:48:01 -05:00
Matt Jaffee
4ab9c66070
allow dashes in frame names 2018-06-26 07:00:13 -05:00
Cody Soyland
ff7c3cb512
Merge branch 'develop' into command-server-opts 2018-06-25 19:42:22 -05:00
Cody Soyland
9f68ea4663 Use OptCommandServerOptions to inject mock TranslateStore 2018-06-25 17:22:34 -05:00
Matt Jaffee
de702dab1e
Merge branch 'develop' into fix-translate 2018-06-25 16:02:12 -05:00
Cody Soyland
a8a2be4bf4
Merge pull request #1411 from codysoyland/api-field-removal
Remove redundant fields from API
2018-06-25 15:10:50 -05:00
Cody Soyland
324028a8c2 Add ability to pass ServerOptions when calling NewCommand 2018-06-25 15:09:36 -05:00
Cody Soyland
790d565890 Remove redundant fields from API (a few remain due to test overrides) 2018-06-25 13:46:50 -05:00
Matt Jaffee
bb33411c5d
remove debugging print statement 2018-06-25 12:40:46 -05:00
Matt Jaffee
288ec9cb83
Merge branch 'develop' into fix-translate 2018-06-25 12:39:53 -05:00
Matt Jaffee
b2dd9c50ca
Merge branch 'develop' into fix-translate 2018-06-25 12:33:52 -05:00
Travis Turner
56f8b92257
Merge pull request #1408 from travisturner/check-header
add wildcard checks to checkHeaderAcceptJSON()
2018-06-25 11:48:43 -05:00
Travis Turner
2e035ee837
Merge branch 'develop' into check-header 2018-06-25 11:41:07 -05:00
Travis Turner
27e6dcea2b
rename checkHeaderAcceptJSON to validHeaderAcceptJSON and reverse boolean logic 2018-06-25 11:26:23 -05:00
Matthew Jaffee
5160ed58f7
Merge pull request #1407 from pilosa/wip-api-refactor
api refactor
2018-06-25 11:26:05 -05:00
Matt Jaffee
8878b02345
cleanup - address review feedback 2018-06-25 11:08:00 -05:00
Travis Turner
9d3332929d
add wildcard checks to checkHeaderAcceptJSON() 2018-06-24 22:45:35 -05:00
Matt Jaffee
6093064ac0
remove unecessary test and convert import test 2018-06-22 16:26:45 -05:00
Matt Jaffee
c9e6d36f94
fix some of the client tests 2018-06-22 13:44:50 -05:00
Matt Jaffee
5d28d2dc31
skip new tests which use test.NewServer 2018-06-22 13:00:52 -05:00
Matt Jaffee
ba9112507d
fix server/handler_test.go for newpql 2018-06-22 12:57:28 -05:00
Matt Jaffee
7a5adf7428
Merge branch 'develop' into wip-api-refactor 2018-06-22 12:46:19 -05:00
Matthew Jaffee
c1f11d40e4
Merge pull request #1382 from pilosa/newpql
Newpql
2018-06-22 12:41:44 -05:00
Matt Jaffee
f5d62de0a2
Merge branch 'develop' into newpql 2018-06-22 12:26:20 -05:00
tgruben
bc46d379b7
Merge pull request #1401 from tgruben/crash-value-overwrite
Fix for Crash
2018-06-22 11:19:57 -05:00
Matt Jaffee
6b57369b51
fix stats tests 2018-06-22 10:44:36 -05:00
Cody Soyland
6dd8b9adc6 Move server initialization to prevent race condition 2018-06-22 10:22:13 -05:00
Todd Gruben
20c8247dc5 Merge branch 'crash-value-overwrite' of github.com:tgruben/pilosa into crash-value-overwrite 2018-06-22 10:06:44 -05:00
Todd Gruben
22a546095a fixed reset method on btree plugin 2018-06-22 10:05:41 -05:00
Yuce Tekol
7aff2173bd
Merge branch 'develop' into update-getting-started 2018-06-22 17:48:00 +03:00
Ben Johnson
8f3189c1b3
Translation fixes, error checking. 2018-06-22 08:12:35 -06:00
Matt Jaffee
80f5b13a97
Merge branch 'develop' into newpql 2018-06-22 09:11:00 -05:00