Permalink
Browse files

merged from dev/grze/evac

  • Loading branch information...
2 parents 74cdc97 + 967f7de commit e93a226e70a6d9300021d1772bd0c7c82e4fa4f5 @dmitrii dmitrii committed Apr 1, 2013
View
@@ -93,3 +93,7 @@ node/test_hooks
node/test_nc
util/euca-generate-fault
/.settings
+.idea/
+.groovy/
+*.[ei]ml
+atlassian-ide-plugin.xml
View
@@ -1,42 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="modules/authentication/src/main/java"/>
- <classpathentry kind="src" path="modules/cloud/src/main/java"/>
- <classpathentry kind="src" path="modules/cluster-manager/src/main/java"/>
+ <classpathentry kind="src" output="modules/authentication/build" path="modules/authentication/src/main/java"/>
+ <classpathentry kind="src" output="modules/autoscaling/build" path="modules/autoscaling/src/main/java"/>
+ <classpathentry kind="src" output="modules/autoscaling-common/build" path="modules/autoscaling-common/src/main/java"/>
+ <classpathentry kind="src" output="modules/cloud/build" path="modules/cloud/src/main/java"/>
+ <classpathentry kind="src" output="modules/cloudwatch/build" path="modules/cloudwatch/src/main/java"/>
+ <classpathentry kind="src" output="modules/cloudwatch-common/build" path="modules/cloudwatch-common/src/main/java"/>
+ <classpathentry kind="src" output="modules/cluster-manager/build" path="modules/cluster-manager/src/main/java"/>
<classpathentry kind="src" path="modules/cluster-manager/conf/scripts"/>
- <classpathentry kind="src" path="modules/component/src/main/java"/>
- <classpathentry kind="src" path="modules/configuration/src/main/java"/>
+ <classpathentry kind="src" output="modules/component/build" path="modules/component/src/main/java"/>
+ <classpathentry kind="src" output="modules/configuration/build" path="modules/configuration/src/main/java"/>
<classpathentry kind="src" path="modules/configuration/conf/scripts"/>
- <classpathentry kind="src" path="modules/core/src/main/java"/>
- <classpathentry kind="src" path="modules/core/src/test/java"/>
+ <classpathentry kind="src" output="modules/core/build" path="modules/core/src/main/java"/>
<classpathentry kind="src" path="modules/core/conf/scripts"/>
- <classpathentry kind="src" path="modules/dns/src/main/java"/>
- <classpathentry kind="src" path="modules/euare/src/main/java"/>
- <classpathentry kind="src" path="modules/euare-common/src/main/java"/>
- <classpathentry kind="src" path="modules/msgs/src/main/java"/>
- <classpathentry kind="src" path="modules/msgs/src/test/java"/>
+ <classpathentry kind="src" output="modules/dns/build" path="modules/dns/src/main/java"/>
+ <classpathentry kind="src" output="modules/euare/build" path="modules/euare/src/main/java"/>
+ <classpathentry kind="src" output="modules/euare-common/build" path="modules/euare-common/src/main/java"/>
+ <classpathentry kind="src" output="modules/loadbalancing/build" path="modules/loadbalancing/src/main/java"/>
+ <classpathentry kind="src" output="modules/loadbalancing-common/build" path="modules/loadbalancing-common/src/main/java"/>
+ <classpathentry kind="src" output="modules/msgs/build" path="modules/msgs/src/main/java"/>
<classpathentry kind="src" path="modules/msgs/conf/jmx"/>
<classpathentry kind="src" path="modules/msgs/conf/scripts"/>
- <classpathentry kind="src" path="modules/notifications/src/main/java"/>
- <classpathentry kind="src" path="modules/postgresql/src/main/java"/>
+ <classpathentry kind="src" output="modules/notifications/build" path="modules/notifications/src/main/java"/>
+ <classpathentry kind="src" output="modules/postgresql/build" path="modules/postgresql/src/main/java"/>
+ <classpathentry kind="src" path="modules/postgresql/conf/init.d"/>
<classpathentry kind="src" path="modules/postgresql/conf/scripts"/>
- <classpathentry kind="src" path="modules/reporting/src/main/java"/>
- <classpathentry kind="src" path="modules/reporting/src/test/java"/>
- <classpathentry kind="src" path="modules/storage-common/src/main/java"/>
- <classpathentry kind="src" path="modules/storage-controller/src/main/java"/>
- <classpathentry kind="src" path="modules/walrus/src/main/java"/>
+ <classpathentry kind="src" output="modules/reporting/build" path="modules/reporting/src/main/java"/>
+ <classpathentry kind="src" output="modules/storage-common/build" path="modules/storage-common/src/main/java"/>
+ <classpathentry kind="src" output="modules/storage-controller/build" path="modules/storage-controller/src/main/java"/>
+ <classpathentry kind="src" output="modules/tokens/build" path="modules/tokens/src/main/java"/>
+ <classpathentry kind="src" output="modules/troubleshooting/build" path="modules/troubleshooting/src/main/java"/>
+ <classpathentry kind="src" output="modules/walrus/build" path="modules/walrus/src/main/java"/>
<classpathentry kind="src" path="modules/walrus/conf/drbd"/>
- <classpathentry kind="src" path="modules/walrus/src/test/java"/>
- <classpathentry kind="src" path="modules/wsstack/src/main/java"/>
+ <classpathentry kind="src" output="modules/wsstack/build" path="modules/wsstack/src/main/java"/>
<classpathentry kind="src" path="modules/wsstack/conf/scripts"/>
- <classpathentry kind="src" path="modules/www/src/main/java"/>
+ <classpathentry kind="src" output="modules/www/build" path="modules/www/src/main/java"/>
<classpathentry kind="src" path="modules/www/conf/www"/>
<classpathentry kind="src" path="modules/troubleshooting/src/main/java"/>
<classpathentry kind="src" path="modules/loadbalancing/src/main/java"/>
<classpathentry kind="src" path="modules/loadbalancing-common/src/main/java"/>
<classpathentry kind="src" path="modules/tokens/src/main/java"/>
<classpathentry kind="con" path="GROOVY_SUPPORT"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/activemq-core-5.4.1.jar"/>
<classpathentry kind="lib" path="lib/ant-1.7.jar"/>
<classpathentry kind="lib" path="lib/antlr-3.0.1.jar"/>
@@ -60,7 +65,7 @@
<classpathentry kind="lib" path="lib/batik-svggen.jar"/>
<classpathentry kind="lib" path="lib/batik-util.jar"/>
<classpathentry kind="lib" path="lib/batik-xml.jar"/>
- <classpathentry kind="lib" path="lib/bcel-5.2.jar" sourcepath="/git/third-party/bcel-5.2"/>
+ <classpathentry kind="lib" path="lib/bcel-5.2.jar"/>
<classpathentry kind="lib" path="lib/bcprov.jar"/>
<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/btm-2.1.0.jar"/>
@@ -99,16 +104,18 @@
<classpathentry kind="lib" path="lib/geronimo-stax-1.0-spec-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/groovy-all-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/guava-r09-gwt.jar"/>
- <classpathentry kind="lib" path="lib/guava-r09.jar" sourcepath="/bzr/third-party/guava-r08"/>
+ <classpathentry kind="lib" path="lib/guava-r09.jar"/>
<classpathentry kind="lib" path="lib/gwt-api-checker-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-dev-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-servlet-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-servlet-deps-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-soyc-vis-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-user-2.2.jar"/>
- <classpathentry kind="lib" path="lib/ha-jdbc-2.0.16-rc-1-jdk1.6.jar" sourcepath="//git/third-party/ha-jdbc-2.0.16-rc-1"/>
+ <classpathentry kind="lib" path="lib/ha-jdbc-2.0.16-rc-1-jdk1.6.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-all-1.2.jar"/>
<classpathentry kind="lib" path="lib/hibernate-3.5.6-Final.jar"/>
+ <classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
+ <classpathentry kind="lib" path="lib/hsqldbutil-1.8.0.10.jar"/>
<classpathentry kind="lib" path="lib/infinispan-core-4.2.1.CR4.jar"/>
<classpathentry kind="lib" path="lib/iText-2.1.7.jar"/>
<classpathentry kind="lib" path="lib/janino-2.5.15-1.jar"/>
@@ -136,9 +143,9 @@
<classpathentry kind="lib" path="lib/jetty6-sslengine-6.1.19.jar"/>
<classpathentry kind="lib" path="lib/jetty6-util-6.1.19.jar"/>
<classpathentry kind="lib" path="lib/jgroups-2.11.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/jibx-bind-1.2.3.jar" sourcepath="/git/third-party/jibx-1.2.3"/>
+ <classpathentry kind="lib" path="lib/jibx-bind-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/jibx-extras-1.2.3.jar"/>
- <classpathentry kind="lib" path="lib/jibx-run-1.2.3.jar" sourcepath="/bzr/third-party/jibx-1.2.3"/>
+ <classpathentry kind="lib" path="lib/jibx-run-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/jibx-schema-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/jibx-tools-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/jminix-0.9.jar"/>
@@ -194,5 +201,6 @@
<classpathentry kind="lib" path="lib/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
+ <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -1,66 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2009-2012 Eucalyptus Systems, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 3 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see http://www.gnu.org/licenses/.
-
- Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
- CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
- additional information or have any questions.
-
- This file may incorporate work covered under the following copyright
- and permission notice:
-
- Software License Agreement (BSD License)
-
- Copyright (c) 2008, Regents of the University of California
- All rights reserved.
-
- Redistribution and use of this software in source and binary forms,
- with or without modification, are permitted provided that the
- following conditions are met:
-
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE
- THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL,
- COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE,
- AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
- IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA,
- SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY,
- WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION,
- REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO
- IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT
- NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS.
- -->
-
<projectDescription>
<name>eucalyptus:clc</name>
<comment></comment>
@@ -77,7 +15,6 @@
<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.python.pydev.pythonNature</nature>
- <nature>com.google.gwt.eclipse.core.gwtNature</nature>
</natures>
<linkedResources>
<link>
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+groovy.classpath.use.groovy,lib=default
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
-groovy.compiler.level=20
+groovy.compiler.level=18
@@ -62,15 +62,16 @@
package com.eucalyptus.cluster.callback;
-import org.apache.log4j.Logger;
import com.eucalyptus.cluster.Cluster;
import com.eucalyptus.node.Nodes;
import com.eucalyptus.util.async.FailedRequestException;
import com.eucalyptus.vmtypes.VmType;
import com.eucalyptus.vmtypes.VmTypes;
+import com.google.common.base.Joiner;
import edu.ucsb.eucalyptus.msgs.DescribeResourcesResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeResourcesType;
import edu.ucsb.eucalyptus.msgs.VmTypeInfo;
+import org.apache.log4j.Logger;
public class ResourceStateCallback extends StateUpdateMessageCallback<Cluster, DescribeResourcesType, DescribeResourcesResponseType> {
private static Logger LOG = Logger.getLogger( ResourceStateCallback.class );
@@ -97,9 +98,14 @@ public ResourceStateCallback( ) {
@Override
public void fire( DescribeResourcesResponseType reply ) {
this.getSubject( ).getNodeState( ).update( reply.getResources( ) );
- LOG.debug( "Adding node service tags: " + reply.getServiceTags( ) );
+ LOG.debug( "Adding node service tags: " + Joiner.on( ", " ).join( reply.getNodes() ) );
if( !reply.getNodes( ).isEmpty( ) ) {
- Nodes.updateNodeInfo( this.getSubject( ).getConfiguration( ), reply.getNodes( ) );
+ try {
+ Nodes.updateNodeInfo( this.getSubject( ).getConfiguration( ), reply.getNodes( ) );
+ } catch ( Exception e ) {
+ LOG.error( e );
+ LOG.trace( e, e );
+ }
}
}
Oops, something went wrong.

0 comments on commit e93a226

Please sign in to comment.