Ard Schrijvers pushed to branch feature/projectdocs at cms-community /
hippo-repository
Commits:
805bdf7f by Ard Schrijvers at 2017-12-02T21:46:24+01:00
REPO-1910 Make sure the LockResourceImpl is thread-safe
Since #close can be invoked concurrently, make the #close method synchronized
Note that #getLock returns the MutableLock object *but* we need this object
because in other case instance equality is checked. This means that code using
the
LockResource could cast the #getLock to MutableLock. Therefor I made the
MutableLock
also thread-safe
Note that the #getHolder returns the Thread object that created the Lock. I
doubt whether Thread objects themselves are thread-safe (hard to google)
but I think this limitation might be acceptable. Not sure if we should
add to the javadoc that the returned #getHolder is not thread-safe?
Either way, most importantly, #close is now thread-safe since I have a use
case that could invoke #close from a stopping cluster node concurrently
with normal code execution (obviously chances are really small and impact
of incorrect concurrent access also small: Only an incorrect warning log)
- - - - -
9ade7341 by Sergey Shepelevich at 2017-12-22T14:53:34+01:00
REPO-1878 Remove duplicated properties from source during autoexport
commit ef8ee50f7d6b10f40ea4cb52a84986512fe30fc3
Author: Sergey Shepelevich <sergey.shepelev...@bloomreach.com>
Date: Fri Dec 15 13:54:10 2017 +0100
REPO-1878 Minor cleanup
commit dac2f12896ed44800a150d60d4d7b901927ffeba
Author: Sergey Shepelevich <sergey.shepelev...@bloomreach.com>
Date: Tue Dec 5 09:48:53 2017 +0100
REPO-1878 Search and remove identical upstream definitions across all
modules
commit e139f4beca4de4856615538a65fd3a22d661fdd6
Author: Peter Centgraf <peter.centg...@bloomreach.com>
Date: Tue Nov 28 17:36:07 2017 +0100
REPO-1878 Minor update to DefinitionMergeService comments; updated test
case to show failure mode
commit 01945156ef830a72581cd67489190c0837c0b9dc
Author: Sergey Shepelevich <sergey.shepelev...@bloomreach.com>
Date: Tue Nov 28 16:45:32 2017 +0100
REPO-1878 Remove duplicated properties from source during autoexport
- - - - -
305da3cd by Ard Schrijvers at 2018-01-03T11:46:44+01:00
REPO-1913 Improve logging and exception handling to make sure the cause is
preserved
- - - - -
075c95c1 by Ard Schrijvers at 2018-01-03T13:34:57+01:00
REPO-1915 Make sure to have latest jcr node states instead of possibly stale
nodes
Since the lock via the LockManager does not involve any jcr locking, it
does *never* trigger a cluster sync. This means that we can get the lock
for a node that has been processed and finished just by another cluster
node that also already freed the lock again. Making sure that after we
obtained the lock to invoke a session refresh should result in that
#isPendingTrigger returns false if another cluster node already did
process the job.
- - - - -
77fca1aa by Ard Schrijvers at 2018-01-03T13:44:55+01:00
REPO-1915 Make sure to have latest jcr node states instead of possibly stale
nodes
- - - - -
f5f06d2c by Ard Schrijvers at 2018-01-03T15:59:06+01:00
REPO-1915 move refresh to try block
- - - - -
d9acdd02 by Ate Douma at 2018-01-03T16:18:25+01:00
REPO-1915 - Ensure/force cluster synchronization in case another instance just
modified the configuration baseline
- - - - -
aad61e4c by Ard Schrijvers at 2018-01-04T14:11:54+01:00
REPO-1854 Merge branch 'master' into feature/projectdocs
- - - - -
30 changed files:
- engine/src/main/java/org/hippoecm/repository/quartz/JCRJobStore.java
- engine/src/main/java/org/onehippo/cm/engine/ConfigurationBaselineService.java
- engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
-
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
- engine/src/main/java/org/onehippo/repository/lock/AbstractLockManager.java
- engine/src/main/java/org/onehippo/repository/lock/MutableLock.java
-
engine/src/main/java/org/onehippo/repository/update/UpdaterExecutionModule.java
-
engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java
- +
engine/src/test/resources/merge/property-upstream-identical/in/diff/hcm-config/diff.yaml
- +
engine/src/test/resources/merge/property-upstream-identical/in/diff/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-identical/in/exportFirst/hcm-config/exportFirst.yaml
- +
engine/src/test/resources/merge/property-upstream-identical/in/exportFirst/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-identical/in/topmost/hcm-config/topmost.yaml
- +
engine/src/test/resources/merge/property-upstream-identical/in/topmost/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-identical/in/upstream/hcm-config/upstream.yaml
- +
engine/src/test/resources/merge/property-upstream-identical/in/upstream/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-multi/in/diff/hcm-config/diff.yaml
- +
engine/src/test/resources/merge/property-upstream-multi/in/diff/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-multi/in/exportFirst/hcm-config/exportFirst.yaml
- +
engine/src/test/resources/merge/property-upstream-multi/in/exportFirst/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-multi/in/topmost/hcm-config/topmost.yaml
- +
engine/src/test/resources/merge/property-upstream-multi/in/topmost/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-multi/in/upstream/hcm-config/upstream.yaml
- +
engine/src/test/resources/merge/property-upstream-multi/in/upstream/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-partial/in/diff/hcm-config/diff.yaml
- +
engine/src/test/resources/merge/property-upstream-partial/in/diff/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-partial/in/exportFirst/hcm-config/exportFirst.yaml
- +
engine/src/test/resources/merge/property-upstream-partial/in/exportFirst/hcm-config/exportSecond.yaml
- +
engine/src/test/resources/merge/property-upstream-partial/in/exportFirst/hcm-module.yaml
- +
engine/src/test/resources/merge/property-upstream-partial/in/exportSecond/hcm-config/main.yaml
The diff was not included because it is too large.
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/5083823d65adbe5a50937634e007fa5254dcf3a9...aad61e4cfe8c877d805eb384c305b190cdcb5ffa
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/5083823d65adbe5a50937634e007fa5254dcf3a9...aad61e4cfe8c877d805eb384c305b190cdcb5ffa
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
