Permalink
Browse files

Add cluster management.

  • Loading branch information...
1 parent e8af124 commit 13352502d4188c460034fd2319a8cf4544bd4096 @cmeiklejohn cmeiklejohn committed Feb 20, 2013
Showing with 2,755 additions and 1,640 deletions.
  1. +5 −4 Makefile
  2. +24 −1 include/riak_control.hrl
  3. +386 −121 priv/admin/css/cluster.styl
  4. +553 −196 priv/admin/css/compiled/style.css
  5. +82 −29 priv/admin/css/general.styl
  6. +17 −1 priv/admin/css/reusable.styl
  7. +12 −3 priv/admin/css/snapshot.styl
  8. BIN priv/admin/images/actions-toggle-slider.png
  9. BIN priv/admin/images/actions-toggle-text.png
  10. BIN priv/admin/images/nav-icons-small.png
  11. BIN priv/admin/images/pointbutton-right-sprite.png
  12. BIN priv/admin/images/pointer.png
  13. BIN priv/admin/images/radio-sprite.png
  14. BIN priv/admin/images/riak-control-logo-small.png
  15. BIN priv/admin/images/right-angle-arrow.png
  16. BIN priv/admin/images/stagebutton-sprite.png
  17. +24 −0 priv/admin/js/app.js
  18. +734 −1 priv/admin/js/cluster.js
  19. +4 −2 priv/admin/js/generated/templates.js
  20. +0 −71 priv/admin/js/legacy/actions.js
  21. +0 −630 priv/admin/js/legacy/cluster.js
  22. +59 −47 priv/admin/js/legacy/gui.js
  23. +5 −2 priv/admin/js/ring.js
  24. +11 −3 priv/admin/js/router.js
  25. +0 −7 priv/admin/js/templates/application.hbs
  26. +96 −113 priv/admin/js/templates/cluster.hbs
  27. +107 −0 priv/admin/js/templates/current_cluster_item.hbs
  28. +29 −0 priv/admin/js/templates/staged_cluster_item.hbs
  29. +1 −1 rebar.config
  30. +381 −0 src/admin_cluster.erl
  31. +0 −67 src/admin_cluster_down.erl
  32. +0 −79 src/admin_cluster_join.erl
  33. +26 −0 src/admin_gui.erl
  34. +0 −90 src/admin_node.erl
  35. +0 −63 src/admin_node_leave.erl
  36. +0 −63 src/admin_node_stop.erl
  37. +24 −0 src/admin_nodes.erl
  38. +14 −0 src/admin_partitions.erl
  39. +16 −15 src/admin_routes.erl
  40. +37 −17 src/riak_control_security.erl
  41. +107 −8 src/riak_control_session.erl
  42. +1 −5 src/riak_control_sup.erl
  43. +0 −1 templates/index.dtl
View
@@ -31,12 +31,10 @@ APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
PLT = $(HOME)/.riak_control_dialyzer_plt
check_plt: compile
- dialyzer --check_plt --plt $(PLT) --apps $(APPS) \
- deps/*/ebin
+ dialyzer --check_plt --plt $(PLT) --apps $(APPS)
build_plt: compile
- dialyzer --build_plt --output_plt $(PLT) --apps $(APPS) \
- deps/*/ebin
+ dialyzer --build_plt --output_plt $(PLT) --apps $(APPS)
dialyzer: compile
@echo
@@ -53,3 +51,6 @@ cleanplt:
@echo
sleep 5
rm $(PLT)
+
+typer:
+ typer --annotate -I ../ --plt $(PLT) -r src
View
@@ -31,6 +31,27 @@
-type ring() :: riak_core_ring:riak_core_ring().
-type handoffs() :: [handoff()].
-type vnodes() :: [vnode()].
+-type plan() :: [] | legacy | ring_not_ready | unavailable.
+
+-type stage_error() :: nodedown
+ | already_leaving
+ | not_member
+ | only_member
+ | is_claimant
+ | invalid_replacement
+ | already_replacement
+ | not_reachable
+ | not_single_node
+ | self_join.
+
+-type action() :: leave
+ | remove
+ | {replace, node()}
+ | {force_replace, node()}.
+
+-type claim_percentage() :: number().
+
+-type change() :: {node(), action()}.
-record(partition_info,
{ index :: index(),
@@ -50,7 +71,9 @@
pending_pct :: float(),
mem_total :: integer(),
mem_used :: integer(),
- mem_erlang :: integer()
+ mem_erlang :: integer(),
+ action :: action(),
+ replacement :: node()
}).
-type partitions() :: [#partition_info{}].
Oops, something went wrong.

0 comments on commit 1335250

Please sign in to comment.