124 Commits

Author SHA1 Message Date
wxyu
5a2743946b MS-562 Add JobMgr and TaskCreator in Scheduler
Former-commit-id: bbaf2b649843e86fc7bbd28ec61e5a990fc5951f
2019-09-18 10:42:01 +08:00
starlord
5f07962cd4 MS-557 merge Log.h
Former-commit-id: 37a1aece83b0885aef1ad60fbd3b26805df57a54
2019-09-17 11:07:39 +08:00
starlord
b77155f3ec merge Log.h
Former-commit-id: 3de21b82b857b7601075b977792ffdd36638e800
2019-09-17 11:05:09 +08:00
wxyu
909e2a0934 add Apache License
Former-commit-id: 8afccd9400189249b2f0c797e6e0f53f74547246
2019-09-17 10:59:51 +08:00
wxyu
6cbf62c35f Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3b0b477ac496700e63f0ecf51fed63d100f2bd24
2019-09-17 10:58:01 +08:00
starlord
63bd4cca5c merge Log.h
Former-commit-id: 1204cfbfddee0b863abf10874ef97f0581c36a9a
2019-09-17 10:57:41 +08:00
wxyu
af9c167ed0 MS-556 Add Job Definition in Scheduler
Former-commit-id: 87787757226f3b397d65125a687442222a5d3532
2019-09-17 10:54:51 +08:00
jinhai
9433bf81cc MS-554 Change license to apache 2.0
Former-commit-id: e09b7dd7872372fa0ece9f5d18ec4c316b89cbe8
2019-09-17 10:51:48 +08:00
jinhai
73ee2e0a7b Update lockguard
Former-commit-id: 1bdcd84679433929e582689661730f1359077c98
2019-09-12 17:58:18 +08:00
jinhai
8c9bbc4467 Fix compile error
Former-commit-id: 2fb38500e2c534d1ddfeca123675c2f425efb2a4
2019-09-12 09:29:09 +00:00
jinhai
bf9e1d7073 Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0
Former-commit-id: aa587bd63672ba5bec583eba3f4737142af02f0d
2019-09-12 09:13:18 +00:00
jinhai
ca53a98c55 Add merge mutex
Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
2019-09-12 17:11:02 +08:00
peng.xu
da99a9e1f0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix build index error

See merge request megasearch/milvus!562

Former-commit-id: 3f42a54ffa04c2f8c53ff6228e982fac8281b4fd
2019-09-12 16:23:44 +08:00
starlord
193d0eeb6d fix build index error
Former-commit-id: 593aeb2482792bfef55fbec8e6480df498cf9708
2019-09-12 16:22:21 +08:00
yudong.cai
f136df4aaa MS-543 send error status to sdk when load index fail
Former-commit-id: a62922b904c7f7d478f5211b4d215d387ea23ae2
2019-09-12 14:10:56 +08:00
wxyu
c569f8acf5 solve conflicts
Former-commit-id: 9d12c13ad3b65384e6f566f83655b0d85028312f
2019-09-12 12:04:47 +08:00
wxyu
54ec2a126d MS-546 Add simple mode resource_config
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
2019-09-12 11:48:45 +08:00
Yu Kun
d6c314b9e6 fix conflicts
Former-commit-id: aa97e1f8864d9cf3c48c41b3670a0f315019350c
2019-09-12 11:18:11 +08:00
jinhai
26c8011294 Change type
Former-commit-id: da3ae3ff25ac26dd1c85a52bd8ddc5538dd42fbd
2019-09-12 10:51:56 +08:00
Yu Kun
4cd641058f remove some nouse changes
Former-commit-id: c550390a97917b975fe456a733efda7d5b17c099
2019-09-11 21:26:35 +08:00
Yu Kun
6afd997b7a Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: d918f411479abd408d66ae84741ffb5231ccce42
2019-09-11 19:08:35 +08:00
yudong.cai
47d98989d0 optimize debug log
Former-commit-id: cf7c5b41a51493072acf68f42649cca532a4d896
2019-09-11 18:28:22 +08:00
Yu Kun
2626f70198 MS-532 Add grpc server unittest
Former-commit-id: 41f4497aeb0572f43c320e473d8640a655fcbae2
2019-09-09 20:17:01 +08:00
jinhai
5c9145aeb7 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
Fix memory double free issue due to random_device

See merge request megasearch/milvus!524

Former-commit-id: 970d947cb84c3317333e7229d1d0c3259623bc71
2019-09-09 20:11:31 +08:00
jinhai
e58c223ad5 Fix memory double free issue due to random_device
Former-commit-id: 371a536cd0e80736d9333cff4178a6785097c87e
2019-09-09 12:02:31 +00:00
wxyu
57eabe260f MS-531 Disable next version code
Former-commit-id: d4148022dd1c10a8c9da0c2119e359cc37e4f53f
2019-09-09 19:35:32 +08:00
wxyu
2af41317e6 MS-530 Add unittest for SearchTask->Load
Former-commit-id: dff97021943c200ca003d766af221c008e5f0ac2
2019-09-09 19:13:30 +08:00
wxyu
28f9fba041 MS-528 Hide some config used future
Former-commit-id: 196031ea29c7328291476429dfda7455f9e284c8
2019-09-09 15:57:02 +08:00
wxyu
6375003116 MS-525 Disable parallel reduce in SearchTask
Former-commit-id: d5a39b47988f8d98cd31f3b5d5801d19dfc3f249
2019-09-09 14:59:42 +08:00
wxyu
7b839d4530 MS-524 Add some unittest in event_test and resource_test
Former-commit-id: 7ed6988953724f2105da11ffaa4254c0276955d7
2019-09-09 14:31:41 +08:00
wxyu
9a16867b8b Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: d8df294b4af67d6f02ed308aff3fc3552ec13d41
2019-09-07 19:26:22 +08:00
wxyu
0061c5ed6c MS-518 Add schedinst_test in scheduler
Former-commit-id: cda00b76b0e2f43513844fb1a11413b135fa3be3
2019-09-07 19:26:03 +08:00
peng.xu
762c13b1d8 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-510 unittest out of memory and crashed

See merge request megasearch/milvus!509

Former-commit-id: 686a06955ab96505cc7e4a709f58cb0667ce2bda
2019-09-07 18:27:09 +08:00
starlord
3610c91130 MS-510 unittest out of memory and crashed
Former-commit-id: 17e5dd44414299840ccba10ae93ff67d10c80405
2019-09-07 18:26:13 +08:00
wxyu
7ed52edd6e MS-517 Update resource_mgr_test in scheduler
Former-commit-id: 1ec8d4869bb1d863a2bd98d64180d19a77f3313b
2019-09-07 18:14:48 +08:00
wxyu
18dd06d07a MS-511 Update resource_test in scheduler
Former-commit-id: 99e298907ae56cfeb2475431080d06c4b34216f7
2019-09-07 16:45:17 +08:00
Yu Kun
4d14dddb51 MS-474 - Create index hang if use branch-0.3.1 server config
Former-commit-id: 6b8e462fcfbfc2bbba93c32851058d1d2c8b1cda
2019-09-07 16:33:07 +08:00
Yu Kun
ac659beda3 MS-474 - Create index hang if use branch-0.3.1 server config
Former-commit-id: 73bb1d714bb99c027bf96ee6a8696e9e68ecec23
2019-09-07 16:19:27 +08:00
wxyu
419097596e solve conflicts
Former-commit-id: c17de2992aa5837228c833e85b749cdc1f92edd9
2019-09-07 14:59:29 +08:00
jinhai
521227bfdb Fix typo and time record
Former-commit-id: bd76bb403d0869125d48ecaf4a853c206e82106c
2019-09-07 06:56:47 +00:00
wxyu
4e0cd172ad solve conflicts
Former-commit-id: 79fbc25376811b5f3ddef4ba1aab786226d95727
2019-09-07 14:55:28 +08:00
wxyu
e757727e48 MS-508 Update normal_test in scheduler
Former-commit-id: 343dae4a96cac46259094de9c1d025de3b3db53e
2019-09-07 14:54:32 +08:00
Yu Kun
e7f5681561 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 6b18ec7e96ac4264a5d75537edadc5503ddbc959
2019-09-07 14:53:10 +08:00
wxyu
1efe696f57 MS-504 Update node_test in scheduler
Former-commit-id: 2477838780d6c2e6403bd1972faa24a0c850f40c
2019-09-07 12:01:36 +08:00
wxyu
d3e91efce1 MS-502 Update tasktable_test in scheduler
Former-commit-id: 019eb3180cfdd09ba7bc016e9b7990c35da4028e
2019-09-07 11:00:33 +08:00
starlord
3d1c10d5ee refine error code
Former-commit-id: 616ad6b30b1292a910a93e5fddb9da5787b57ac1
2019-09-06 20:14:22 +08:00
Yu Kun
23d253ea85 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: c8c9e0080c386a357afdacb77440b1c0e6ab1cc2
2019-09-06 11:20:14 +08:00
Yu Kun
ba0640dbf8 add profiling
Former-commit-id: df257a19fb3976072733b6933759358d7e5c6abb
2019-09-06 11:20:05 +08:00
wxyu
67ed920307 solve conflicts
Former-commit-id: 49468077be74bf12b4407d9c91c3864d8229bcdc
2019-09-05 20:02:32 +08:00
wxyu
c26513a035 MS-488 Improve code format in scheduler
Former-commit-id: e6051b03b5fa09ff5e1e20af65724efb86520edf
2019-09-05 19:58:54 +08:00