mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Fix for MNT-8840 Incorporate the Solr RAM capacity planning formula into the Solr admin page
Fix for MNT-8662 capacity planning: document formula to calculate the disk space needed by the DB git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -50,6 +50,10 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
|
||||
private static String ALFRESCO_APPROX_INDEXING_TIME_REMAINING = "tracker.alfresco.approx.indexing.time.remaining";
|
||||
|
||||
private static String ALFRESCO_DISK = "tracker.alfresco.disk";
|
||||
|
||||
private static String ALFRESCO_MEMORY = "tracker.alfresco.memory";
|
||||
|
||||
private static String ARCHIVE_ACTIVE = "tracker.archive.active";
|
||||
|
||||
private static String ARCHIVE_LAG = "tracker.archive.lag";
|
||||
@@ -62,7 +66,9 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
|
||||
private static String ARCHIVE_APPROX_INDEXING_TIME_REMAINING = "tracker.archive.approx.indexing.time.remaining";
|
||||
|
||||
private static String ARCHIVE_DISK = "tracker.archive.disk";
|
||||
|
||||
private static String ARCHIVE_MEMORY = "tracker.archive.memory";
|
||||
|
||||
|
||||
@Override
|
||||
@@ -76,6 +82,8 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAST_INDEXED_TXN)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_APPROX_TXNS_REMAINING)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_APPROX_INDEXING_TIME_REMAINING)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_DISK)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_MEMORY)
|
||||
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG)
|
||||
@@ -83,6 +91,8 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_APPROX_TXNS_REMAINING)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_APPROX_INDEXING_TIME_REMAINING)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAST_INDEXED_TXN)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_DISK)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_MEMORY)
|
||||
;
|
||||
}
|
||||
|
||||
@@ -111,6 +121,8 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
String alfrescoLastIndexedTxn = alfresco.getString("Id for last TX in index");
|
||||
String alfrescoApproxTxnsReminaing = alfresco.getString("Approx transactions remaining");
|
||||
String alfrescoApproxIndexingTimeReminaing = alfresco.getString("Approx transaction indexing time remaining");
|
||||
String alfrescoDisk = alfresco.getString("On disk (GB)");
|
||||
String alfrescoMemory = alfresco.getString("Total Searcher Cache (GB)");
|
||||
|
||||
|
||||
JSONObject archive = summary.getJSONObject("archive");
|
||||
@@ -120,6 +132,8 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
String archiveLastIndexedTxn = archive.getString("Id for last TX in index");
|
||||
String archiveApproxTxnsReminaing = archive.getString("Approx transactions remaining");
|
||||
String archiveApproxIndexingTimeReminaing = archive.getString("Approx transaction indexing time remaining");
|
||||
String archiveDisk = archive.getString("On disk (GB)");
|
||||
String archiveMemory = archive.getString("Total Searcher Cache (GB)");
|
||||
|
||||
if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE))
|
||||
{
|
||||
@@ -150,6 +164,14 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
{
|
||||
return alfrescoApproxIndexingTimeReminaing;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_DISK))
|
||||
{
|
||||
return alfrescoDisk;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_MEMORY))
|
||||
{
|
||||
return alfrescoMemory;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE))
|
||||
{
|
||||
return archiveActive;
|
||||
@@ -174,6 +196,14 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
{
|
||||
return archiveApproxIndexingTimeReminaing;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_DISK))
|
||||
{
|
||||
return archiveDisk;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_MEMORY))
|
||||
{
|
||||
return archiveMemory;
|
||||
}
|
||||
else
|
||||
{
|
||||
return "Unavailable";
|
||||
@@ -219,6 +249,14 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
{
|
||||
return "Unavailable: solr subsystem not started";
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_DISK))
|
||||
{
|
||||
return "Unavailable: solr subsystem not started";
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_MEMORY))
|
||||
{
|
||||
return "Unavailable: solr subsystem not started";
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG))
|
||||
{
|
||||
return "Unavailable: solr subsystem not started";
|
||||
@@ -239,6 +277,14 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
{
|
||||
return "Unavailable: solr subsystem not started";
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_DISK))
|
||||
{
|
||||
return "Unavailable: solr subsystem not started";
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_MEMORY))
|
||||
{
|
||||
return "Unavailable: solr subsystem not started";
|
||||
}
|
||||
else
|
||||
{
|
||||
return super.getProperty(name);
|
||||
@@ -256,6 +302,8 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_LAST_INDEXED_TXN);
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_APPROX_TXNS_REMAINING);
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_APPROX_INDEXING_TIME_REMAINING);
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_DISK);
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_MEMORY);
|
||||
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_LAG);
|
||||
@@ -263,6 +311,8 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_LAST_INDEXED_TXN);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_APPROX_TXNS_REMAINING);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_APPROX_INDEXING_TIME_REMAINING);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_DISK);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_MEMORY);
|
||||
result.addAll(super.getPropertyNames());
|
||||
return result;
|
||||
}
|
||||
|
Reference in New Issue
Block a user