Permalink
Browse files

merged from eee; fixed broken cluster build

  • Loading branch information...
dmitrii committed Dec 3, 2011
2 parents c405962 + e26724e commit 8631d91d59f5503ff45562580d183b0499861ad9
@@ -619,6 +619,10 @@ class upgrade_20_30 extends AbstractUpgradeScript {
def oldHome = System.getProperty( "euca.upgrade.old.dir" );
def newHome = System.getProperty( "euca.upgrade.new.dir" );
+ if (!has_table('eucalyptus_config', 'config_vmwarebroker')) {
+ return true;
+ }
+
connMap['eucalyptus_config'].rows('SELECT * FROM config_vmwarebroker').each{
EntityWrapper<VMwareBrokerConfiguration> dbcfg = EntityWrapper.get(VMwareBrokerConfiguration.class);
VMwareBrokerConfiguration broker = new VMwareBrokerConfiguration(it.config_component_name, it.config_component_name + '_vmbroker', it.config_component_hostname, it.config_component_port);
@@ -256,16 +256,6 @@ public void check() throws EucalyptusCloudException {
} catch (EucalyptusCloudException ex) {
LOG.fatal(ex);
}
- EntityWrapper<BucketInfo> db = EntityWrapper.get(BucketInfo.class);
- BucketInfo bucketInfo = new BucketInfo();
- List<BucketInfo> bucketInfos = db.query(bucketInfo);
- for (BucketInfo bucket : bucketInfos) {
- if (!storageManager.bucketExists(bucket.getBucketName()))
- bucket.setHidden(true);
- else
- bucket.setHidden(false);
- }
- db.commit();
}
public ListAllMyBucketsResponseType listAllMyBuckets(
View
@@ -74,7 +74,6 @@ permission notice:
#include <server-marshal.h>
#include <handlers.h>
-#include <storage.h>
#include <vnetwork.h>
#include <misc.h>
#include <ipc.h>
View
@@ -75,7 +75,6 @@ permission notice:
#include <server-marshal.h>
#include <handlers.h>
-#include <storage.h>
#include <vnetwork.h>
#include <misc.h>
#include <ipc.h>
View
@@ -1147,7 +1147,6 @@ static int init (void)
logprintfl(EUCAINFO, "physical memory available for instances: %lldMB\n", nc_state.mem_max);
logprintfl(EUCAINFO, "virtual cpu cores available for instances: %lld\n", nc_state.cores_max);
-
// adopt running instances
adopt_instances();

0 comments on commit 8631d91

Please sign in to comment.