Permalink
Browse files

Squashed commit of the following:

commit 7078a2c31946b5ef4ef60c17331df678ef8a6fcf
Author: chuck <chuck@eucalyptus.com>
Date:   Thu Mar 28 14:20:22 2013 -0700

    Fix issue with user console after merge from maint/3.2/testing.

commit 70d5b08a5d78d01f3cf8527fe4fadb3ca7a3d986
Author: chuck <chuck@eucalyptus.com>
Date:   Thu Mar 28 11:45:23 2013 -0700

    Fix compilation error after merge from 3.2

commit 854509c9dbab60ef79acb07f5433f4087ac5714c
Author: chuck <chuck@eucalyptus.com>
Date:   Mon Mar 25 14:12:37 2013 -0700

    Apparently I need to persist the entry as well
    EUCA-5508

commit 6ff9712254f00cd107565a39c32b740bb077533d
Author: chuck <chuck@eucalyptus.com>
Date:   Mon Mar 25 10:01:40 2013 -0700

    Use VmInstance instead of VmBootRecord for upgrade
    EUCA-5508

commit ecbea6e10ed5f20e5590816f6f65ff635073c7d2
Author: chuck <chuck@eucalyptus.com>
Date:   Fri Mar 22 11:35:19 2013 -0700

    Fix issue where new DB field isn't being upgraded properly
    EUCA-5508
    Conflicts:

    	clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmBootRecord.java

commit bae522803b85a866352e271a1af01814eb2ac44e
Author: mmunn1 <mmunn1@eucalyptus.com>
Date:   Thu Mar 7 13:09:06 2013 -0800

    EUCA-5033 Cannot detach "root" EBS volume from stopped instance

commit a5feecbc9013ec7381dd49a154b96183e2915ae2
Merge: 8f9154c 90896d3
Author: chuck <chuck@eucalyptus.com>
Date:   Thu Mar 28 11:16:32 2013 -0700

    Merge branch 'maint/3.2/testing' into dev/chuck/merge32

    Conflicts:
    	configure
    	console/eucaconsole/__init__.py

commit 90896d3
Author: chris grzegorczyk <grze@eucalyptus.com>
Date:   Wed Mar 27 15:37:03 2013 -0700

    Fix to walrus service lookup EUCA-5554

commit cc656f8
Author: Swathi Gangisetty <swathi@eucalyptus.com>
Date:   Mon Mar 25 22:12:42 2013 -0700

    Fixes EUCA-5463: iSCSI Perl scripts fail to work if hostname is used instead of IP address for the SAN.

    Modified regex in iscsitarget_common.pl to parse hostname/IP address from iSCSI session information

commit 4e768b4
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 26 12:04:38 2013 -0700

    Revert "EUCA-5033 Cannot detach "root" EBS volume from stopped instance"

    This reverts commit 6e174aa.

commit 6238971
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 26 12:04:27 2013 -0700

    Revert "Fix issue where new DB field isn't being upgraded properly"

    This reverts commit 88177bb.

commit a16ecc9
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 26 12:04:16 2013 -0700

    Revert "Use VmInstance instead of VmBootRecord for upgrade"

    This reverts commit 374e153.

commit bca7175
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 26 12:03:44 2013 -0700

    Revert "Apparently I need to persist the entry as well"

    This reverts commit 282b39c.

commit 282b39c
Author: chuck <chuck@eucalyptus.com>
Date:   Mon Mar 25 14:12:37 2013 -0700

    Apparently I need to persist the entry as well
    EUCA-5508

commit 374e153
Author: chuck <chuck@eucalyptus.com>
Date:   Mon Mar 25 10:01:40 2013 -0700

    Use VmInstance instead of VmBootRecord for upgrade
    EUCA-5508

commit 88177bb
Author: chuck <chuck@eucalyptus.com>
Date:   Fri Mar 22 11:35:19 2013 -0700

    Fix issue where new DB field isn't being upgraded properly
    EUCA-5508

commit 25df506
Author: chuck <chuck@eucalyptus.com>
Date:   Wed Mar 20 16:16:49 2013 -0700

    Run autoconf on configure.ac
    EUCA-644

commit 0f28259
Merge: 0583c3b 96a0560
Author: chuck <chuck@eucalyptus.com>
Date:   Wed Mar 20 10:21:36 2013 -0700

    Merge branch 'maint/3.2/testing' into team/clc-dev/BROKER-20

commit 96a0560
Author: chuck <chuck@eucalyptus.com>
Date:   Wed Mar 20 10:12:10 2013 -0700

    Add CFLAGS to flag list.
    EUCA-644

commit 3926c8a
Merge: 6040200 90c94b5
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 19 23:34:00 2013 -0700

    Merge branch 'dev/chuck/EUCA-644' into maint/3.2/testing

commit 90c94b5
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 19 23:32:00 2013 -0700

    Fix CFLAGS in AC rather than in configure
    EUCA-644

commit 0583c3b
Merge: 6c36713 b3f050b
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 19 18:12:17 2013 -0700

    Merge branch 'maint/3.2/testing' into team/clc-dev/BROKER-20

commit 6c36713
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 19 18:09:36 2013 -0700

    Fixes issues where VBR sizes aren't properly set
    EUCA-5454

commit 6040200
Author: dkavanagh <dkavanagh@gmail.com>
Date:   Tue Mar 19 15:50:44 2013 -0400

    EUCA-5450
    corrected version in about dialog
  • Loading branch information...
1 parent 8f9154c commit 32052445a50f51ea1fe797bf26a878f4b9fdee97 @gelinasc gelinasc committed Mar 28, 2013
@@ -91,12 +91,7 @@
private static Logger LOG = Logger.getLogger( Bundles.class );
public static MessageCallback createCallback( BundleInstanceType request ) throws AuthException, IllegalContextAccessException, ServiceStateException {
- Component walrus = Components.lookup( Walrus.class );
- NavigableSet<ServiceConfiguration> configs = walrus.services( );
- if ( configs.isEmpty( ) || !Component.State.ENABLED.equals( configs.first( ).lookupState( ) ) ) {
- throw new ServiceStateException( "Failed to bundle instance because there is no available walrus service at the moment." );
- }
- final String walrusUrl = ServiceUris.remote( configs.first( ) ).toASCIIString( );
+ final String walrusUrl = ServiceUris.remote( Topology.lookup( Walrus.class ) ).toASCIIString( );
request.setUrl( walrusUrl );
request.setAwsAccessKeyId( Accounts.getFirstActiveAccessKeyId( Contexts.lookup( ).getUser( ) ) );
return new BundleCallback( request );
@@ -64,22 +64,29 @@
import static com.eucalyptus.util.Parameters.checkParam;
import static org.hamcrest.Matchers.*;
+
import java.util.Arrays;
+import java.util.List;
import java.util.Set;
+
import javax.persistence.CollectionTable;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.Embeddable;
+import javax.persistence.EntityTransaction;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.PreRemove;
+
+import org.apache.log4j.Logger;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.Parent;
import org.hibernate.annotations.Type;
import com.eucalyptus.cloud.ImageMetadata;
import com.eucalyptus.cloud.util.MetadataException;
+import com.eucalyptus.entities.Entities;
import com.eucalyptus.images.BlockStorageImageInfo;
import com.eucalyptus.images.BootableImageInfo;
import com.eucalyptus.images.Emis.BootableSet;
@@ -90,7 +97,12 @@
import com.eucalyptus.keys.SshKeyPair;
import com.eucalyptus.vmtypes.VmType;
import com.eucalyptus.vmtypes.VmTypes;
+import com.eucalyptus.upgrade.Upgrades.EntityUpgrade;
+import com.eucalyptus.upgrade.Upgrades.Version;
+import com.eucalyptus.util.Exceptions;
+import com.google.common.base.Predicate;
import com.google.common.collect.Sets;
+
import edu.ucsb.eucalyptus.msgs.VmTypeInfo;
@@ -332,4 +344,26 @@ private void setSshKeyString( String sshKeyString ) {
this.sshKeyString = sshKeyString;
}
+ @EntityUpgrade( entities = { VmBootRecord.class }, since = Version.v3_2_2, value = com.eucalyptus.component.id.Eucalyptus.class )
+ public enum VmBootRecordUpgrade implements Predicate<Class> {
+ INSTANCE;
+ private static Logger LOG = Logger.getLogger( VmBootRecord.VmBootRecordUpgrade.class );
+ @Override
+ public boolean apply( Class arg0 ) {
+ EntityTransaction db = Entities.get( VmInstance.class );
+ try {
+ List<VmInstance> entities = Entities.query( new VmInstance( ) );
+ for ( VmInstance entry : entities ) {
+ LOG.debug( "Upgrading BootRecord: " + entry.toString() );
+ entry.setDeleteOnTerminate(false);
+ Entities.persist(entry);
+ }
+ db.commit( );
+ return true;
+ } catch ( Exception ex ) {
+ db.rollback();
+ throw Exceptions.toUndeclared( ex );
+ }
+ }
+ }
}
View
@@ -3759,7 +3759,7 @@ LIBS="`getconf LFS64_LIBS` `getconf LFS_LIBS` $LIBS"
CFLAGS="${CFLAGS} `getconf LFS64_CFLAGS` `getconf LFS_CFLAGS`"
# compile options
-CFLAGS="${CFLAGS} -Wall -fPIC -DHAVE_CONFIG_H -std=gnu99"
+CFLAGS="${CFLAGS} -Wall -Wno-unused-variable -fPIC -DHAVE_CONFIG_H -std=gnu99"
INCLUDES="${INCLUDES} -I. -I.. -Igenerated -I${TOP}/storage -I${TOP}/node -I${TOP}/util -I${TOP}/net"
# Arguments checking
View
@@ -49,10 +49,10 @@ ant_min_version="1.6.5"
# these are for large files (>2GB)
LDFLAGS="`getconf LFS64_LDFLAGS` `getconf LFS_LDFLAGS` $LDFLAGS"
LIBS="`getconf LFS64_LIBS` `getconf LFS_LIBS` $LIBS"
-CFLAGS="`getconf LFS64_CFLAGS` `getconf LFS_CFLAGS`"
+CFLAGS="${CFLAGS} `getconf LFS64_CFLAGS` `getconf LFS_CFLAGS`"
# compile options
-CFLAGS="${CFLAGS} -Wall -fPIC -DHAVE_CONFIG_H -std=gnu99"
+CFLAGS="${CFLAGS} -Wall -Wno-unused-variable -fPIC -DHAVE_CONFIG_H -std=gnu99"
INCLUDES="${INCLUDES} -I. -I.. -Igenerated -I${TOP}/storage -I${TOP}/node -I${TOP}/util -I${TOP}/net"
# Arguments checking
@@ -0,0 +1 @@
+Messages_fi_FI.properties
@@ -0,0 +1 @@
+Messages.properties
@@ -0,0 +1 @@
+Messages.properties
@@ -0,0 +1 @@
+Messages_ja.properties
@@ -0,0 +1 @@
+Messages_ko_KR.properties
@@ -0,0 +1 @@
+Messages_ru.properties
@@ -0,0 +1 @@
+en
@@ -0,0 +1 @@
+zh
View
View
@@ -0,0 +1 @@
+../cluster
View
View
@@ -0,0 +1 @@
+../devel
View
View
@@ -0,0 +1 @@
+../gatherlog
View
View
@@ -0,0 +1 @@
+../net
View
View
@@ -0,0 +1 @@
+../node
View
View
@@ -0,0 +1 @@
+../storage
View
View
@@ -0,0 +1 @@
+../tools
View
View
@@ -0,0 +1 @@
+../util
View
View
@@ -0,0 +1 @@
+../wsdl

0 comments on commit 3205244

Please sign in to comment.