Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
249 commits
Select commit Hold shift + click to select a range
124dfc5
cluster3
Sep 2, 2013
15b70a8
mock mon app
Sep 2, 2013
8d4bc48
+ ecv
Sep 3, 2013
aafac9b
+ updates
Sep 3, 2013
61d7db2
+ debug workers features
Sep 3, 2013
1d6c800
+ emitter bugfixes
Sep 4, 2013
c7e34e1
+ debug live working!
Sep 4, 2013
c915fc5
+ status bugfix, indeed an emitter's issue, must replicate the worker…
Sep 4, 2013
fa34e32
+ worker gracefully exit whenStop
Sep 4, 2013
d75fc74
Create README.md
inexplicable Sep 4, 2013
0a2ebe0
Update README.md
inexplicable Sep 4, 2013
1ca47c6
+ status bugfix when a worker disconnects
Sep 4, 2013
a7b33f3
Merge remote-tracking branch 'origin/cluster3' into cluster3
Sep 4, 2013
92f8284
+ bugfix of duplicate master 'debug-finished'
Sep 5, 2013
a46b8bd
cache api detailed
inexplicable Sep 5, 2013
94e5b7a
Update README.md
inexplicable Sep 5, 2013
da2eafe
+ caches monitor view supported
Sep 5, 2013
43ced3d
Merge remote-tracking branch 'origin/cluster3' into cluster3
Sep 5, 2013
ee93427
bugfixes
Sep 6, 2013
7d7955b
+ adding simple logger support
inexplicable Sep 11, 2013
ccf482c
+ heuristic design
inexplicable Sep 11, 2013
70731cc
+ updated .gitignore
Sep 11, 2013
8322c2c
Merge remote-tracking branch 'origin/cluster3' into cluster3
Sep 11, 2013
0154951
+ refactorings
Sep 11, 2013
bd43553
+ designed & implemented the heuristics of #markOld
Sep 12, 2013
04b5588
+ event handler dedup
Sep 12, 2013
0888756
+ refactorings & doc
Sep 13, 2013
75759be
+ update deps
Sep 14, 2013
0012988
+ enforce message encoding/decoding to avoid '\r\n' symbols
inexplicable Sep 14, 2013
6820505
Merge branch 'cluster3' of https://github.com/inexplicable/cubejs-clu…
inexplicable Sep 14, 2013
f0873e9
Merge branch 'cluster3' of https://github.com/inexplicable/cubejs-clu…
Sep 17, 2013
6a92267
~ cluster3 debugging experience improvements
Sep 18, 2013
41573ce
Merge pull request #3 from cubejs/cluster3
inexplicable Sep 18, 2013
c17ec1d
Merge branch 'cluster3' of https://github.com/inexplicable/cubejs-clu…
inexplicable Sep 19, 2013
9f812cb
+ to enjoy the newly released node-inspector ~0.4.0
inexplicable Sep 19, 2013
8706778
+ allow saveLiveEdit to be an option, will help in dev
inexplicable Sep 19, 2013
bba5874
+ tests for ECV started
inexplicable Sep 20, 2013
47cfa1d
+ renamed exitIfBusyPort to rejectIfPortBusy to align with the promis…
inexplicable Sep 20, 2013
04f6a02
+ finished 'control' mode ecv unit test
inexplicable Sep 20, 2013
dc991b4
+ pickAvailablePort to utils.js
Sep 20, 2013
9f46ce3
+ unit test for utils, bugfixes of utils.js
Sep 20, 2013
b42aa2d
+ 'use strict' & fixed octal literal
Sep 20, 2013
ae84cb5
~ avoid dup comp registry
Sep 21, 2013
b653a5c
+ bugfix of port availability check, use http server to verify confid…
inexplicable Sep 21, 2013
c19d48c
~ moved unit tests to /test folder and leave /test/lib to cluster's w…
inexplicable Sep 21, 2013
d593808
+ cluster-emitter unit test added, included 'optimist' for argv parsi…
inexplicable Sep 21, 2013
f175d62
+ simplified cluster-emitter & cluster-status usages, could be requir…
inexplicable Sep 21, 2013
9c6e368
+ refactored cluster-emitter to emitter & cluster-status to status
inexplicable Sep 21, 2013
695990b
+ status unit test
inexplicable Sep 21, 2013
f12c3ef
+ pending cluster-status cluster unit test
inexplicable Sep 22, 2013
2734eac
+ simple shutdown support
inexplicable Sep 22, 2013
2b4a1ff
+ major cache api rewrite, added 'namespace' and let user deal with '…
Sep 23, 2013
da92bb4
+ cache monitor draft support
Sep 24, 2013
d7ef3e9
+ namespace related bugfixes
inexplicable Sep 24, 2013
b1a307f
Merge pull request #23 from inexplicable/cluster3
inexplicable Sep 24, 2013
be5660c
+ refactor socket usage in monitor-app.js
inexplicable Sep 24, 2013
ae8336f
+ spread status & caches view to all workers, whether new or existing…
Sep 24, 2013
345271f
+ refactor Slave to standalone puppet.js class for better unit test a…
Sep 24, 2013
d8c0cd6
+ refactor moved node-inspector creation to utils to further simplify…
Sep 24, 2013
eb4da6b
+ refactorings, moved startInspector to utils.js
Sep 24, 2013
c47f831
Merge pull request #24 from inexplicable/cluster3
inexplicable Sep 24, 2013
a06634c
+ refactorings, renamed monitor-app.js to monitor to allow dependency…
inexplicable Sep 25, 2013
c587712
~ bugfix & refactorings of cache-mgr.js
inexplicable Sep 25, 2013
79c64b4
Update README.md
inexplicable Sep 25, 2013
687ed2a
Update README.md
inexplicable Sep 25, 2013
cbc3305
+ refactorings to alter the order of watch callback for 'null' key, w…
inexplicable Sep 25, 2013
dabd850
Merge remote-tracking branch 'origin/cluster3' into cluster3
inexplicable Sep 25, 2013
aa6319d
+ refactorings and simplifications
Sep 25, 2013
7aef21e
~ adding 'isMaster', 'isWorker' api to give same api for 'cluster'
Sep 25, 2013
41eb5ad
Merge pull request #25 from inexplicable/cluster3
inexplicable Sep 25, 2013
135235a
~ fix #markOld
Sep 25, 2013
c304ec9
+ persistence meta: lastModified, lastPersisted to avoid unneeded per…
Sep 25, 2013
064059c
+
Sep 25, 2013
3352821
+ experimental support for #run compared with #listen
Sep 26, 2013
a92a528
Update README.md
inexplicable Sep 26, 2013
6f1c1c9
Update README.md
inexplicable Sep 26, 2013
938e77e
+ markOld bugfix, and API updates
Sep 26, 2013
ba97188
Merge pull request #26 from inexplicable/cluster3
inexplicable Sep 26, 2013
92e8986
extracted assertOld to utils and added unit test for it
inexplicable Sep 26, 2013
e65cca6
+ added stat to cache.js & cache-usr.js
Sep 26, 2013
2ad35ca
+ expose emitter, status, cache, monitor, ecv from index.js to allow …
Sep 26, 2013
a5c3295
refactorings
Sep 26, 2013
9f643a8
+ extracted deathQueue logic out of puppet.js and moved to utils.js f…
Sep 27, 2013
06695d1
- .js
inexplicable Sep 27, 2013
08e713c
Merge remote-tracking branch 'origin/cluster3' into cluster3
inexplicable Sep 27, 2013
8c60ff4
fixed locking, added 'lock' support from mgr/usr, no adhoc '/lock' ke…
inexplicable Sep 27, 2013
84dc850
fixed npm test and refactorings of puppet.js
inexplicable Sep 27, 2013
7f2857c
just some refactorings
inexplicable Sep 27, 2013
0c222bd
puppet bugfix and unit test
inexplicable Sep 27, 2013
e744d0a
+ cache persistence bugfix
Sep 27, 2013
0f4b350
+ fixed #listen promise rejected issue from both master & worker
Sep 27, 2013
f9a3010
+ fixed worker issue 'this.emitter' missing this scope
Sep 27, 2013
703a10d
+ worker unit test & gc info bugfix
Sep 28, 2013
56e9f7d
+ refactorings
Sep 28, 2013
78fa957
puppet unit test
inexplicable Sep 28, 2013
91a5da7
Merge branch 'cluster3' of https://github.com/inexplicable/cubejs-clu…
inexplicable Sep 28, 2013
379e715
fix monitor server issue conflict between node-gc & socket.io?
inexplicable Sep 28, 2013
3066596
temp fix node-gc & socket.io conflict, added gc monitor option, added…
inexplicable Sep 28, 2013
3c4d8b6
Merge pull request #27 from inexplicable/cluster3
inexplicable Sep 28, 2013
b3a197d
remove redundant port no.
inexplicable Sep 28, 2013
5e7989e
travis branch narrow to cluster3
inexplicable Sep 28, 2013
085d8d7
npm pretest to create ./log
inexplicable Sep 28, 2013
7804435
travis node version
inexplicable Sep 28, 2013
153911b
defer ecv markup till all workers initially created got warmup
inexplicable Sep 28, 2013
21ee7e1
cache api udpate, use is now synchronous, meta, stats async instead, …
inexplicable Sep 28, 2013
083c3de
must find an alternative to node-gc, it causes problem with node-insp…
inexplicable Sep 28, 2013
4716d96
+ fixed gc conflicts, using gc-stats module, but wrap with own utils.…
inexplicable Sep 29, 2013
b5c60ad
+ add a long running cluster demo using dust template:
inexplicable Sep 29, 2013
347b357
+ added 'uptime', 'tps', 'cycle' to heartbeat
inexplicable Sep 29, 2013
f52a075
+ some bugfix
inexplicable Sep 29, 2013
23204ba
+ added 'configureApp' to allow 'before' server listen application co…
Sep 30, 2013
e04d957
+ warmup fix, separated configureapp out
Sep 30, 2013
8a86e91
+ added /deps route, fixed max depth issue, updated README
Sep 30, 2013
1116ebd
+ allow configureApp to return promise
inexplicable Sep 30, 2013
923fd4c
Update README.md
inexplicable Sep 30, 2013
60ba2fb
shutdown
Sep 30, 2013
a4cbf73
+ solve shutdown issue which gets obsolete master pid
Sep 30, 2013
0c218c7
+ emitter api update, added
Oct 1, 2013
3ca9c70
Merge pull request #28 from inexplicable/cluster3
inexplicable Oct 1, 2013
6f78bc7
+ simplified ecv control to use 'url' only, event based mechanism wit…
inexplicable Oct 1, 2013
c704b38
+ refactorings
inexplicable Oct 1, 2013
6cee8cc
+ shutdown now has complete check and guard
inexplicable Oct 1, 2013
643f3ce
Merge pull request #29 from inexplicable/cluster3
inexplicable Oct 1, 2013
90a7ce3
- remove obsolete comment
inexplicable Oct 2, 2013
c40e790
+ fixed usage of `timeout`
inexplicable Oct 2, 2013
6b94cbb
use bdd style
Oct 1, 2013
06f33fc
+ fixed warm up issue
Oct 2, 2013
0efc351
+ added 'pauseMS' to the gc info collected
Oct 3, 2013
a48bf97
+ mainly refactorings, separated assertOld to assertOld & assertBadGC…
inexplicable Oct 3, 2013
b1bdd44
Update README.md
Beefpotato Oct 3, 2013
ad699da
Merge pull request #4 from Beefpotato/patch-1
inexplicable Oct 3, 2013
f398997
Merge pull request #32 from inexplicable/cluster3
inexplicable Oct 3, 2013
f08403e
+ fixed deathQueue's corner case
inexplicable Oct 4, 2013
067d8fc
+ fix unit tests failures due to 'monConfigureApp'
inexplicable Oct 5, 2013
02d902e
Merge pull request #36 from inexplicable/cluster3
inexplicable Oct 5, 2013
95e5f8b
+ fix travis
inexplicable Oct 5, 2013
d914f3f
+ try fixing travis...
inexplicable Oct 5, 2013
c5b372e
+ try switching port range
inexplicable Oct 5, 2013
92381f6
+ all unit tests fixed, pending restored cluster-status-test.js
inexplicable Oct 5, 2013
1ea5da4
Merge pull request #37 from inexplicable/cluster3
inexplicable Oct 5, 2013
b707f3f
api updates, use latest code, explained application flow
inexplicable Oct 5, 2013
38e375f
Merge pull request #5 from cubejs/cluster3
inexplicable Oct 5, 2013
90244e3
implement nanny protection to avoid run away workers
Oct 6, 2013
e3d4a6e
implement nanny protection to avoid run away workers, readme
Oct 6, 2013
29a0e1b
+ just refactorings, reduce the require used upfront in master.js, as…
inexplicable Oct 6, 2013
446e3f6
+ fix #run, mainly for testing smaller granualities which depends on …
inexplicable Oct 6, 2013
2b048ff
refactorings, documentations for index#listen
Oct 7, 2013
0078248
Merge pull request #38 from inexplicable/cluster3
inexplicable Oct 8, 2013
8428d25
Update master-test.js
inexplicable Oct 8, 2013
8ed9146
updates
Oct 12, 2013
f739b08
~ allow require('cluster2/cache') to work, otherwise has to be requir…
Oct 12, 2013
931f37d
Merge pull request #44 from inexplicable/cluster3
inexplicable Oct 12, 2013
7b84f9a
~ make deathQueue monitorable
Oct 14, 2013
3c35dff
~ bugfix and refactorings
Oct 16, 2013
408b013
~ allow 'pids' path to be overwritten, from cmd argv or params
Oct 21, 2013
faf094b
Merge pull request #45 from inexplicable/cluster3
inexplicable Oct 22, 2013
b287833
~ don't require 'getLogger' explicitly
Oct 22, 2013
a8d335a
~ prevent multiple caching request
Oct 22, 2013
f6d188f
Merge pull request #46 from inexplicable/cluster3
inexplicable Oct 22, 2013
98bf7d6
+ moved shutdown to top level
Oct 22, 2013
385cd40
~ shutdown script update
Oct 22, 2013
4574624
Merge pull request #47 from inexplicable/cluster3
inexplicable Oct 22, 2013
d9cc3eb
Merge pull request #3 from cubejs/master
zhuchenwang Oct 30, 2013
254f4ba
Added warm up code
Nov 3, 2013
77a6df9
Clean the branch
Nov 3, 2013
603db02
Clean the branch
Nov 3, 2013
762c3a9
Added test cases to test cache performance
Nov 3, 2013
5926018
Merge branch 'cluster3' of https://github.com/cubejs/cluster2 into cu…
Nov 3, 2013
c1f41b5
merge
Nov 3, 2013
90faeff
Merge pull request #50 from zhuchenwang/cluster3
inexplicable Nov 5, 2013
ea6e52a
+ support for worker pause & resume initial commit
Nov 19, 2013
484e7c9
Merge pull request #7 from cubejs/cluster3
inexplicable Nov 19, 2013
7be1261
Merge pull request #52 from inexplicable/cluster3
inexplicable Nov 19, 2013
66ea7a3
+ pause/resume implemented, added to monitor
Nov 19, 2013
c29bdeb
Merge pull request #53 from inexplicable/cluster3
inexplicable Nov 19, 2013
3e680ae
Merge pull request #7 from cubejs/cluster3
zhuchenwang Nov 20, 2013
229a3fa
Added test cases to test pause and resume worker
Nov 20, 2013
4be6cd8
+ warmup enhancements
Nov 20, 2013
57a2869
Merge pull request #55 from inexplicable/cluster3
inexplicable Nov 20, 2013
08f8bdb
Merge pull request #8 from cubejs/cluster3
zhuchenwang Nov 20, 2013
8c5c249
Moved the cache performance test to a separate folder
Nov 20, 2013
a68be91
~ bugfix of master warmup
Nov 20, 2013
b749e3e
Merge pull request #56 from inexplicable/cluster3
inexplicable Nov 20, 2013
c80ce55
Merge branch 'cluster3' of https://github.com/cubejs/cluster2 into cu…
Nov 20, 2013
0e9f0d7
~ fix failure of test case, where cache info got overwritten by concu…
Nov 20, 2013
2e30517
Merge pull request #57 from inexplicable/cluster3
inexplicable Nov 20, 2013
fd79dc5
~ fix of address returning to warmup callback
Nov 20, 2013
82c2320
Merge pull request #58 from inexplicable/cluster3
inexplicable Nov 20, 2013
64639f3
Merge branch 'cluster3' of https://github.com/cubejs/cluster2 into cu…
Nov 21, 2013
7b7385e
Merge branch 'cluster3' of https://github.com/cubejs/cluster2 into cu…
Nov 21, 2013
997dd70
~ fixed duplicate listening event in puppet
inexplicable Nov 21, 2013
622ab0f
~ fixed duplicate listening event in puppet
inexplicable Nov 21, 2013
d894460
Merge pull request #59 from inexplicable/cluster3
inexplicable Nov 21, 2013
97bc55f
Merge pull request #10 from cubejs/cluster3
zhuchenwang Nov 21, 2013
7ec35c0
Fixed bug that work does not actually warm up on different ports
Nov 21, 2013
a7758ea
~
Nov 21, 2013
af53120
~ manually merged: https://github.com/zhuchenwang/cluster2/commit/7ec…
Nov 21, 2013
ce84693
https://github.com/zhuchenwang/cluster2/commit/7ec35c020b86635455bb66…
Nov 21, 2013
4ac069b
Merge pull request #60 from inexplicable/cluster3
inexplicable Nov 21, 2013
a7a37a5
~ refactorings and fixing 'emitter#to' missing
Nov 22, 2013
4e40b7b
~ refactorings
Nov 22, 2013
ff279f2
Merge branch 'cluster3' of https://github.com/cubejs/cluster2 into cu…
Nov 22, 2013
270051d
Modified test cases to pick up available ports
Nov 22, 2013
14c205c
Merge pull request #54 from zhuchenwang/cubejs-cluster3
zhuchenwang Nov 22, 2013
aefde29
Modified the execution order in master.js
Nov 22, 2013
b21af27
Increased the timeout for cluster-cache-test
Nov 22, 2013
618a090
Decreased the load of cluster-cache-test
Nov 22, 2013
7c58e53
Merge pull request #61 from zhuchenwang/cubejs-cluster3
inexplicable Nov 22, 2013
8487ced
Merge pull request #8 from cubejs/cluster3
inexplicable Nov 22, 2013
775d90d
~ refactorings
Nov 23, 2013
93abc70
refactorings
inexplicable Nov 24, 2013
5eee012
Merge pull request #62 from inexplicable/cluster3
inexplicable Nov 24, 2013
e985ab1
refactorings, updated README
inexplicable Nov 25, 2013
6bb6d83
Merge pull request #63 from inexplicable/cluster3
inexplicable Nov 25, 2013
8699e5d
refactorings, defer logger creation till needed
inexplicable Nov 25, 2013
497729d
Updated warmUp Interface in README.MD
zhuchenwang Nov 25, 2013
b3ea495
Merge pull request #12 from cubejs/cluster3
zhuchenwang Nov 25, 2013
38379e1
strict warmup, stop ecv markup if any warmup failed
inexplicable Nov 26, 2013
46311cc
Merge pull request #64 from inexplicable/cluster3
inexplicable Nov 26, 2013
0f8aeb9
Wrapped the sockets into one socket
Nov 26, 2013
6850dbc
bugfixes
Nov 26, 2013
462df44
~ minor bugfix
Nov 26, 2013
52abffe
Merge pull request #65 from inexplicable/cluster3
inexplicable Nov 26, 2013
dbc2479
Modifed to use cacheSocket in cache
Nov 26, 2013
b23a49e
Modifed to use cacheSocket in cache
Nov 27, 2013
8b32937
Used axon to implement cache
Nov 27, 2013
81abde7
~ updated 'monitor'
Dec 2, 2013
112ba32
Merge pull request #66 from inexplicable/cluster3
inexplicable Dec 2, 2013
1c876b5
~ set publishConfig
Dec 2, 2013
215f26c
Merge pull request #67 from inexplicable/cluster3
inexplicable Dec 2, 2013
6bba3f5
~ fixed package.json
Dec 2, 2013
ee97003
Merge pull request #68 from inexplicable/cluster3
inexplicable Dec 2, 2013
4f8a720
Merge pull request #9 from cubejs/cluster3
inexplicable Dec 3, 2013
579995e
updates after nodesummit, added uvmon to heartbeat, using process.clu…
inexplicable Dec 4, 2013
09e2f28
Merge branch 'cluster3' of https://github.com/inexplicable/cubejs-clu…
inexplicable Dec 4, 2013
27055d5
fix multiple instances in a single process
inexplicable Dec 5, 2013
f4bb249
Merge pull request #13 from cubejs/cluster3
zhuchenwang Dec 8, 2013
babc1ee
axon rewrite
Dec 8, 2013
4776b60
Merge branch 'cubejs-cluster3' into cluster3_axon
Dec 8, 2013
93eb03c
Rewrited cache mechanism using axon
Dec 8, 2013
aca582b
Merge pull request #69 from inexplicable/cluster3
zhuchenwang Dec 11, 2013
0c85c04
Merge pull request #74 from cubejs/cluster3
zhuchenwang Dec 11, 2013
9579663
Merge pull request #15 from cubejs/cluster3
zhuchenwang Dec 11, 2013
4ec944c
~ avoid duplicate #whenStop calls
Dec 11, 2013
d54a6d4
~ separate spontaneous 'disconnect' & preemptive 'dismiss' (it caused…
Dec 12, 2013
433ef90
~ 'close' is triggered by worker#disconnect from cluster, no need to …
Dec 12, 2013
dd7e6fb
Merge pull request #16 from inexplicable/cluster3
zhuchenwang Dec 12, 2013
6e08cfa
Merge pull request #17 from zhuchenwang/cubejs-cluster3
zhuchenwang Dec 12, 2013
14beebe
Merge pull request #73 from zhuchenwang/cluster3_axon
inexplicable Dec 17, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ reports
target
docs
logs
log
cluster-cache-domain
cluster-cache-persist
ports
Expand Down
4 changes: 4 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
*.iml
.travis.yml
.idea
node_modules
test
examples
log
pids
cluster-cache-domain
cluster-cache-persist
ports
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
language: node_js
node_js:
- 0.8
- 0.10

branches:
only:
- cluster3

before_script:
- "npm install"
Expand Down
14 changes: 0 additions & 14 deletions LICENSE.md

This file was deleted.

30 changes: 0 additions & 30 deletions Makefile

This file was deleted.

Loading