malavan
|
9f1f29543f
|
Merge remote-tracking branch 'opensource/unstable' into keydbpro
Former-commit-id: cf40fa5da29ba9574d20d706d0a41ca7001df95a
|
2021-08-11 20:41:54 +00:00 |
|
VivekSainiEQ
|
e0bdb4fca6
|
Merge remote-tracking branch 'upstream/unstable' into redisearch_fixes
Former-commit-id: 952ae9fbe38b99593ec175da6718a5d7fae49837
|
2021-08-11 19:28:04 +00:00 |
|
John Sully
|
2616ed75cc
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 81ded8a35daa5100cac7299a7d0b5f43ee7ac74f
|
2021-07-09 04:41:47 +00:00 |
|
John Sully
|
c0160a4415
|
Merge tag '6.2.3' into unstable
Former-commit-id: 1895dbb7680fa9aadf6040912e89c733abc8c706
|
2021-07-09 04:40:31 +00:00 |
|
John Sully
|
f4151f0d6b
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
|
2021-05-28 23:32:46 +00:00 |
|
VivekSainiEQ
|
4933615dc1
|
Initialized serverTL in more places in module.cpp
Former-commit-id: 8d81592bec0a62b8f3eae6b8c924887839909e2c
|
2021-05-25 16:55:47 +00:00 |
|
John Sully
|
ea6a0f214b
|
Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17adec5d406d2e30a5b9ea71c07fce5c
|
2021-05-21 05:54:39 +00:00 |
|
John Sully
|
f49d8f9adb
|
Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
|
2021-05-19 02:59:48 +00:00 |
|
VivekSainiEQ
|
cb43eda420
|
Created and initialized seperate thread variables for modules
Former-commit-id: 3bb6b16c4a8f692b46040b72a51bef57fa03f1e6
|
2021-03-30 13:46:03 -04:00 |
|
VivekSainiEQ
|
f4dbaab531
|
Removed hasModuleGIL boolean and added fix from PR #292
Former-commit-id: 68d213f4c9c1c3161929a5e20ca4f2b27665c8fd
|
2021-03-19 20:10:24 +00:00 |
|
VivekSainiEQ
|
932fd2e79a
|
added lock releasing w/ hasModuleGIL, changed module serverTL, and moved module_blocking_pipe to global scope to fix issue #276
Former-commit-id: 7d9a2ce827a2f8d48e4682b3cc95460cc82f9778
|
2021-03-19 20:08:28 +00:00 |
|
John Sully
|
078abba316
|
Merge branch 'unstable' into keydbpro
Former-commit-id: e2140793f2bf565972ada799af73bf4457e2718d
|
2021-02-08 18:17:09 +00:00 |
|
christianEQ
|
c69b2845fd
|
Merge remote-tracking branch 'opensource/unstable' into keydbpro
Former-commit-id: 5bad058733de2c217340bb9ee48f02b07d754808
|
2021-02-03 18:10:27 +00:00 |
|
John Sully
|
cb5119b756
|
Simplify the handling of CreateTimer
Former-commit-id: 7b4e25008a352bd425582a3e60b26894826af626
|
2021-02-01 15:51:22 -05:00 |
|
VivekSainiEQ
|
b0f94bd4b5
|
Modified RM_CreateTimer to prevent more that one function being posted at a time
Former-commit-id: f66e5a9c3d6925c3c6d383fbc43fbfbd56721dad
|
2021-02-01 15:51:22 -05:00 |
|
VivekSainiEQ
|
cf122aa54d
|
Changed RM_CreateTimer to only call aePostFunction is existing aePostFunction isn't in flight
Former-commit-id: 9954f5b4a48286d07fb876fd9579801365b6c237
|
2021-02-01 15:51:22 -05:00 |
|
VivekSainiEQ
|
84dc6401c7
|
Now post entire timer installation process as one function to make atomic with respect to global locks
Former-commit-id: 53936661c88bd7eac88308afc75c510134a8e044
|
2021-02-01 15:51:22 -05:00 |
|
VivekSainiEQ
|
662037e3a3
|
Removed more uses of fSynchronous and the use of condition variable and mutex on the control struct.
Former-commit-id: 6ab08cc3e1429178b26b55ed7aa8ba85240eb766
|
2021-02-01 15:51:22 -05:00 |
|
VivekSainiEQ
|
2addbe7e4a
|
Added fix for scenario where module thread waiting for s_mutexModule in acquireGIL can deadlock with module thread waiting for s_mutex in releaseGIL
Former-commit-id: 3205373bb378f895824cc1936a6bae663b1abdcc
|
2021-02-01 15:51:22 -05:00 |
|
VivekSainiEQ
|
dd0b8af2c5
|
removed synchronous calls to aePostFunction and changed scope of g_fModuleThread in order to prevent module related deadlocks, issue #214
Former-commit-id: 3b8d1f7076e4ab2082cd0768abc7b0b6ed4f951a
|
2021-02-01 15:51:22 -05:00 |
|
christianEQ
|
c068f2cd3d
|
Merge tag 'tags/6.0.10' into redismerge_2021-01-20
Former-commit-id: dadce055f897cee83946c2d3e5cbb76341b94230
|
2021-01-26 21:43:09 +00:00 |
|
John Sully
|
5c832c5ad0
|
Merge branch 'unstable' into keydbpro
Former-commit-id: b7a1e16c0f04e8aeb3764e3681fa14fc0f97f6a3
|
2020-12-10 02:37:28 +00:00 |
|
John Sully
|
19a4d2d358
|
Remove addReply*Async methods since we already know if its async or not. This is just a source of bugs
Former-commit-id: df22cdf6e91a1b9c390b69c4209c719ecf1e44f1
|
2020-10-24 02:18:03 +00:00 |
|
John Sully
|
04f834037a
|
Fix module test failures due to locking
Former-commit-id: 420ccdfbaebc452b9b374b54c6ebeec4a3ffea36
|
2020-10-01 00:08:54 +00:00 |
|
John Sully
|
14daf6f909
|
Merge tag '6.0.8' into unstable
Former-commit-id: 4c7e4b91a6bb2034636856b608b8c386d07f5541
|
2020-09-30 19:47:55 +00:00 |
|
John Sully
|
8c2c0fba12
|
Merge branch 'PRO_RELEASE_6' into keydbpro
Former-commit-id: bffe010ea5279bee869bc61cc6d933979e10bbea
|
2020-07-13 03:32:14 +00:00 |
|
John Sully
|
f17dab1f67
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 0dafbc254a0efd5ee302d5c58fb2ca0a85110104
|
2020-07-13 03:31:47 +00:00 |
|
John Sully
|
6158cdfd29
|
Prevent deadlock in RM_ThreadSafeContextLock() when triggered as part of a module callback in a server thread
Former-commit-id: e01312642be3cc78e7b383dee958a9b5c0ffc103
|
2020-07-12 18:17:53 +00:00 |
|
John Sully
|
324e8e01f2
|
COW pointer is not thread safe so we need a global expire lock
Former-commit-id: ac12eef75301564d920e622a08e4f586486fd395
|
2020-06-09 19:58:42 -04:00 |
|
John Sully
|
df3f1e8d8e
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 08a36155e3db9918048e87c3d691b7317787c9ab
|
2020-06-01 17:41:37 -04:00 |
|
John Sully
|
0a9a32e5d7
|
Fix module multithreaded test failures
Former-commit-id: 1ef35cf466ea944c56974b3795d7d6b5e89f5a3d
|
2020-05-31 23:46:12 -04:00 |
|
John Sully
|
e0a0d93a07
|
Merge branch 'unstable' into keydbpro
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
|
2020-05-24 14:41:53 -04:00 |
|
John Sully
|
193d7c76cb
|
Fix bad merge in CI.yml
Former-commit-id: 6311d709c39b3bacaeab77b18033010f1b548f81
|
2020-05-21 22:09:06 -04:00 |
|
John Sully
|
4246199553
|
Merge commit '7cb94fd6cc9e1ad106964171023457ae3ff0a40b' into unstable
Former-commit-id: 7676f5b15f24a044257250b8891d23b14642da48
|
2020-05-21 17:36:53 -04:00 |
|
John Sully
|
5935707790
|
Merge commit '2535a172c1247d5d32d6f2fefe51b95c27ba8ae1' into unstable
Former-commit-id: 7a15f6dfc7331d6759201137971e7c2965672be8
|
2020-05-21 17:30:56 -04:00 |
|
John Sully
|
fe8acd0b30
|
Remove debugging logs
Former-commit-id: 407375887429ebd3efd6e21ae58766397d1324d3
|
2020-05-14 22:18:29 -04:00 |
|
John Sully
|
268f2efb48
|
Fix crash during RDB save with module events
Former-commit-id: 0f7eac411eccb853d7e50152e2bbd1ee28e6ee53
|
2020-05-11 01:02:58 -04:00 |
|
John Sully
|
5ea1948d68
|
Merge branch 'unstable' into keydbpro
Former-commit-id: d89c15518f984c1d4d4e7638a4e8ac5aa499632a
|
2020-05-11 00:53:38 -04:00 |
|
John Sully
|
03b811b13c
|
Fix crash during hook module test
Former-commit-id: 628d168049d00526169d13e31f540820aed1437c
|
2020-05-10 21:57:16 -04:00 |
|
John Sully
|
f76a52b957
|
Fix crash in module tests
Former-commit-id: 37423757b54b2052512dcfeaba72ccbd360d3c1e
|
2020-05-10 21:06:38 -04:00 |
|
John Sully
|
f627dd8cbe
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
John Sully
|
f69c169c04
|
Merge tag '6.0-rc3' into redis_6_merge
Redis 6.0 RC3.
Former-commit-id: b2cb10de5f39b4d8e1ee19877c2bdaf19eefd9db
|
2020-04-14 22:56:19 -04:00 |
|
John Sully
|
ce54857237
|
Merge commit '454e12cb8961f21c9dd8502dc82ae6ffd7e22fe0' into redis_6_merge
Former-commit-id: cc3ebbe5194e9744fb84ce490e90ac5fbe7f8716
|
2020-04-14 22:19:29 -04:00 |
|
John Sully
|
8750cb5a3b
|
Merge commit '07c75f60f3fe0b300fd7913bab3d2d7e612afb03' into redis_6_merge
Former-commit-id: 2941792a85653258a36f8eb02189132ec7835242
|
2020-04-14 21:13:42 -04:00 |
|
John Sully
|
4f56e9c3b0
|
Merge commit 'e91ca9fee9c56ef319b407b104afc435be0c53cb' into redis_6_merge
Former-commit-id: 516c8c6e231cdfc87a3db5be401407cb7afa3937
|
2020-04-14 20:42:48 -04:00 |
|
John Sully
|
68c50ae876
|
Merge commit '6718d5d37517bd927635649708913affb98f67c9' into redis_6_merge
Former-commit-id: ef1236b6009ebd7b00f6dd2f43df57ad95e51253
|
2020-04-14 20:19:48 -04:00 |
|
John Sully
|
d48ea996e7
|
Merge commit '13fbdf970660b15011c4312f31137e58bbda5b2c' into redis_6_merge
Former-commit-id: cde199a7973ad63317b68f581df607321e12bf46
|
2020-04-14 19:43:04 -04:00 |
|
John Sully
|
2038fa270a
|
Merge commit '491949ee5bf4ffbfc746ea4ed5a6d673b0e2fb81' into redis_6_merge
Former-commit-id: 09e8fb17cd0889ad17461e48446221b3955f5a8f
|
2020-04-14 18:44:42 -04:00 |
|
John Sully
|
9039879f80
|
Merge commit '2ad427f862084e0e18fbd6c313af35ccdb6c68f7' into redis_6_merge
Former-commit-id: d71c4c221580221c2c31b5e3b5d23bab50a544dc
|
2020-04-14 18:30:26 -04:00 |
|
John Sully
|
3aa271fe38
|
Merge branch 'unstable' into keydbpro
Former-commit-id: fec8209c1996112976d927d65dbc2b4492131681
|
2020-02-07 16:46:13 -05:00 |
|