Skip to content

Commit

Permalink
# ignite-239
Browse files Browse the repository at this point in the history
  • Loading branch information
@sboikov
sboikov committed Feb 27, 2015
1 parent 1689a20 commit 4f7dbf7
Showing 1 changed file with 33 additions and 38 deletions.
71 changes: 33 additions & 38 deletions modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
View file
Expand Up @@ -1517,44 +1517,36 @@ private void start0(GridStartContext startCtx) throws IgniteCheckedException {
/**
* @param cfg Ignite configuration copy to.
* @return New ignite configuration.
* @throws IgniteCheckedException If failed.
*/
private IgniteConfiguration initializeConfiguration(IgniteConfiguration cfg)
throws IgniteCheckedException {
IgniteConfiguration myCfg = new IgniteConfiguration(cfg);

initializeDefaultConfigurationParameters(myCfg);

return myCfg;
}

/**
* Initialize default parameters.
*/
public void initializeDefaultConfigurationParameters(IgniteConfiguration cfg) throws IgniteCheckedException {
cfg.setIgniteHome(U.getIgniteHome());
myCfg.setIgniteHome(U.getIgniteHome());

// Local host.
String locHost = IgniteSystemProperties.getString(IGNITE_LOCAL_HOST);

cfg.setLocalHost(F.isEmpty(locHost) ? cfg.getLocalHost() : locHost);
myCfg.setLocalHost(F.isEmpty(locHost) ? myCfg.getLocalHost() : locHost);

// Override daemon flag if it was set on the factory.
if (daemon)
cfg.setDaemon(true);
myCfg.setDaemon(true);

Marshaller marsh = cfg.getMarshaller();
Marshaller marsh = myCfg.getMarshaller();

if (marsh == null) {
if (!U.isHotSpot()) {
U.warn(log, "GridOptimizedMarshaller is not supported on this JVM " +
U.warn(log, "OptimizedMarshaller is not supported on this JVM " +
"(only Java HotSpot VMs are supported). Switching to standard JDK marshalling - " +
"object serialization performance will be significantly slower.",
"To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release.");

marsh = new JdkMarshaller();
}
else if (!OptimizedMarshaller.available()) {
U.warn(log, "GridOptimizedMarshaller is not supported on this JVM " +
U.warn(log, "OptimizedMarshaller is not supported on this JVM " +
"(only recent 1.6 and 1.7 versions HotSpot VMs are supported). " +
"To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release. " +
"Switching to standard JDK marshalling - " +
Expand All @@ -1567,7 +1559,7 @@ else if (!OptimizedMarshaller.available()) {
marsh = new OptimizedMarshaller();
}
else if (marsh instanceof OptimizedMarshaller && !U.isHotSpot()) {
U.warn(log, "Using GridOptimizedMarshaller on untested JVM (only Java HotSpot VMs were tested) - " +
U.warn(log, "Using OptimizedMarshaller on untested JVM (only Java HotSpot VMs were tested) - " +
"object serialization behavior could yield unexpected results.",
"Using GridOptimizedMarshaller on untested JVM.");
}
Expand All @@ -1576,16 +1568,16 @@ else if (marsh instanceof OptimizedMarshaller && !U.isHotSpot()) {
String depModeName = IgniteSystemProperties.getString(IGNITE_DEP_MODE_OVERRIDE);

if (!F.isEmpty(depModeName)) {
if (!F.isEmpty(cfg.getCacheConfiguration())) {
if (!F.isEmpty(myCfg.getCacheConfiguration())) {
U.quietAndInfo(log, "Skipping deployment mode override for caches (custom closure " +
"execution may not work for console Visor)");
}
else {
try {
DeploymentMode depMode = DeploymentMode.valueOf(depModeName);

if (cfg.getDeploymentMode() != depMode)
cfg.setDeploymentMode(depMode);
if (myCfg.getDeploymentMode() != depMode)
myCfg.setDeploymentMode(depMode);
}
catch (IllegalArgumentException e) {
throw new IgniteCheckedException("Failed to override deployment mode using system property " +
Expand All @@ -1595,59 +1587,62 @@ else if (marsh instanceof OptimizedMarshaller && !U.isHotSpot()) {
}
}

cfg.setMarshaller(marsh);
myCfg.setMarshaller(marsh);

cfg.setConnectorConfiguration(cfg.getConnectorConfiguration() != null ?
new ConnectorConfiguration(cfg.getConnectorConfiguration()) : null);
myCfg.setConnectorConfiguration(myCfg.getConnectorConfiguration() != null ?
new ConnectorConfiguration(myCfg.getConnectorConfiguration()) : null);

IgfsConfiguration[] igfsCfgs = cfg.getIgfsConfiguration();
IgfsConfiguration[] igfsCfgs = myCfg.getIgfsConfiguration();

if (igfsCfgs != null) {
IgfsConfiguration[] clone = igfsCfgs.clone();

for (int i = 0; i < igfsCfgs.length; i++)
clone[i] = new IgfsConfiguration(igfsCfgs[i]);

cfg.setIgfsConfiguration(clone);
myCfg.setIgfsConfiguration(clone);
}

if (cfg.getMBeanServer() == null)
cfg.setMBeanServer(ManagementFactory.getPlatformMBeanServer());
if (myCfg.getMBeanServer() == null)
myCfg.setMBeanServer(ManagementFactory.getPlatformMBeanServer());

if (cfg.getNodeId() == null)
cfg.setNodeId(UUID.randomUUID());
if (myCfg.getNodeId() == null)
myCfg.setNodeId(UUID.randomUUID());

if (cfg.getPeerClassLoadingLocalClassPathExclude() == null)
cfg.setPeerClassLoadingLocalClassPathExclude(EMPTY_STR_ARR);
if (myCfg.getPeerClassLoadingLocalClassPathExclude() == null)
myCfg.setPeerClassLoadingLocalClassPathExclude(EMPTY_STR_ARR);

StreamerConfiguration[] streamerCfgs = cfg.getStreamerConfiguration();
StreamerConfiguration[] streamerCfgs = myCfg.getStreamerConfiguration();

if (streamerCfgs != null) {
StreamerConfiguration[] clone = streamerCfgs.clone();

for (int i = 0; i < streamerCfgs.length; i++)
clone[i] = new StreamerConfiguration(streamerCfgs[i]);

cfg.setStreamerConfiguration(clone);
myCfg.setStreamerConfiguration(clone);
}

cfg.setTransactionConfiguration(cfg.getTransactionConfiguration() != null ?
new TransactionConfiguration(cfg.getTransactionConfiguration()) : null);
myCfg.setTransactionConfiguration(myCfg.getTransactionConfiguration() != null ?
new TransactionConfiguration(myCfg.getTransactionConfiguration()) : null);

if (cfg.getUserAttributes() == null) {
if (myCfg.getUserAttributes() == null) {
Map<String, ?> emptyAttr = Collections.emptyMap();
cfg.setUserAttributes(emptyAttr);
myCfg.setUserAttributes(emptyAttr);
}

initializeDefaultCacheConfiguration(cfg);
initializeDefaultCacheConfiguration(myCfg);

initializeDefaultSpi(myCfg);

initializeDefaultSpi(cfg);
return myCfg;
}

/**
* Initialize default cache configuration.
*
* @param cfg Ignite configuration.
* @throws IgniteCheckedException If failed.
*/
public void initializeDefaultCacheConfiguration(IgniteConfiguration cfg) throws IgniteCheckedException {
CacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration();
Expand Down

0 comments on commit 4f7dbf7

Please sign in to comment.