Revision 1b2a59a7
Added by Andreas Kohlbecker over 12 years ago
src/main/java/eu/etaxonomy/cdm/server/Bootloader.java | ||
---|---|---|
567 | 567 |
private void verifyMemoryRequirement(String memoryName, long requiredSpaceServer, long requiredSpacePerInstance, long availableSpace) { |
568 | 568 |
|
569 | 569 |
|
570 |
long recommendedMinimumSpace = calculateRecommendedMinimumSpace(requiredSpaceServer, requiredSpacePerInstance);
|
|
570 |
long recommendedMinimumSpace = recommendedMinimumSpace(requiredSpaceServer, requiredSpacePerInstance, null);
|
|
571 | 571 |
|
572 | 572 |
if(recommendedMinimumSpace > availableSpace){ |
573 | 573 |
|
... | ... | |
585 | 585 |
int i=0; |
586 | 586 |
for(CdmInstanceProperties instanceProps : configAndStatusSet){ |
587 | 587 |
i++; |
588 |
if(i * requiredSpacePerInstance > availableSpace){
|
|
588 |
if(recommendedMinimumSpace(requiredSpaceServer, requiredSpacePerInstance, i) > availableSpace){
|
|
589 | 589 |
instanceProps.setStatus(Status.disabled); |
590 | 590 |
instanceProps.getProblems().add("Disabled due to: " + message); |
591 | 591 |
} |
... | ... | |
596 | 596 |
/** |
597 | 597 |
* @param requiredServerSpace |
598 | 598 |
* @param requiredSpacePerIntance |
599 |
* @param numOfInstances may be null, the total number of instances found in the current configuration is used in this case. |
|
599 | 600 |
* @return |
600 | 601 |
*/ |
601 |
public long calculateRecommendedMinimumSpace(long requiredServerSpace, long requiredSpacePerIntance) { |
|
602 |
return (configAndStatusSet.size() * requiredSpacePerIntance) + requiredServerSpace; |
|
602 |
public long recommendedMinimumSpace(long requiredServerSpace, long requiredSpacePerIntance, Integer numOfInstances) { |
|
603 |
if(numOfInstances == null){ |
|
604 |
numOfInstances = configAndStatusSet.size(); |
|
605 |
} |
|
606 |
return (numOfInstances * requiredSpacePerIntance) + requiredServerSpace; |
|
603 | 607 |
} |
604 | 608 |
|
605 | 609 |
/** |
Also available in: Unified diff
display and calculation of recommended minimum space