Project

General

Profile

« Previous | Next » 

Revision 65e24b3f

Added by Andreas Müller almost 4 years ago

remove PERM_GEN_SPACE handling as we are only using Java8 or higher now

View differences:

src/main/java/eu/etaxonomy/cdm/server/JvmManager.java
22 22 
 */
23 23 
public class JvmManager {
24 24 

  		




  25
  
  
    
    // Java 7


  		




  26
  
  
    
    private static final String SUFFIX_PERM_GEN = "Perm Gen";


  		




  27
  25
  
    
    // Java > 8


  		




  28
  26
  
    
    private static final String SUFFIX_META = "Metaspace";


  		




  29
  27
  
    

  		




  30
  28
  
    
    public static final Logger logger = Logger.getLogger(JvmManager.class);


  		




  31
  29
  
    

  		




  32
  
  
    
    public static MemoryUsage getPermGenSpaceUsage(){


  		




  33
  
  
    
        return getMemoryPoolUsage(SUFFIX_PERM_GEN);


  		




  34
  
  
    
    }


  		




  35
  
  
    

  		




  36
  30
  
    
    public static MemoryUsage getMetaSpaceUsage(){


  		




  37
  31
  
    
        return getMemoryPoolUsage(SUFFIX_META);


  		




  38
  32
  
    
    }


  		












  

    
      src/main/java/eu/etaxonomy/cdm/server/instance/InstanceManager.java
    
  





  11
  11
  
    
import static eu.etaxonomy.cdm.server.AssumedMemoryRequirements.HEAP_CDMSERVER;


  		




  12
  12
  
    
import static eu.etaxonomy.cdm.server.AssumedMemoryRequirements.HEAP_PER_INSTANCE;


  		




  13
  13
  
    
import static eu.etaxonomy.cdm.server.AssumedMemoryRequirements.MB;


  		




  14
  
  
    
import static eu.etaxonomy.cdm.server.AssumedMemoryRequirements.PERM_GEN_SPACE_CDMSERVER;


  		




  15
  
  
    
import static eu.etaxonomy.cdm.server.AssumedMemoryRequirements.PERM_GEN_SPACE_PER_INSTANCE;


  		




  16
  14
  
    

  		




  17
  15
  
    
import java.io.File;


  		




  18
  16
  
    
import java.io.IOException;


  		




  ......




  286
  284
  
    

  		




  287
  285
  
    
        verifyMemoryRequirement("HeapSpace", HEAP_CDMSERVER, HEAP_PER_INSTANCE, JvmManager.getHeapMemoryUsage()


  		




  288
  286
  
    
                .getMax());


  		




  289
  
  
    
        if (JvmManager.getJvmVersion() == 7) {


  		




  290
  
  
    
            verifyMemoryRequirement("PermGenSpace", PERM_GEN_SPACE_CDMSERVER, PERM_GEN_SPACE_PER_INSTANCE, JvmManager


  		




  291
  
  
    
                    .getPermGenSpaceUsage().getMax());


  		




  292
  
  
    
        }


  		




  293
  
  
    

  		




  294
  287
  
    
    }


  		




  295
  288
  
    

  		




  296
  289
  
    
    private void verifyMemoryRequirement(String memoryName, long requiredSpaceServer, long requiredSpacePerInstance,


  		












Also available in:  Unified diff