~smoser/ubuntu/maverick/eucalyptus/maverick.bug611144

« back to all changes in this revision

Viewing changes to clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/LVM2Manager.java

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland
  • Date: 2010-04-14 13:48:48 UTC
  • Revision ID: james.westby@ubuntu.com-20100414134848-29vwvc1tnpngji05
Tags: 1.6.2-0ubuntu30
* Cherry-pick merge from upstream 1.6.2, now on revision 1222
  - LP: #552883 - r1222, fix volume statistics
  - LP: #552829 - r1221, fix volume state
  - LP: #552115 - r1220, fix node registration when nc+cc colocated
  - LP: #551778 - r1219, fix sc documentation
  - LP: #545000 - r1218, fix bad bucket name handling
* debian/control: recommend qemu-kvm, rather than kvm
* eucalyptus-cc.install, eucalyptus-cc.links, rules, 15-eucalyptus-url:
  - relocate the help text and url to just after the 10-help-text links,
    and before 50-landscape-sysinfo, which should come after; also,
    install the script as a conffile in /etc, rather than a symlink
    which allows the admin to modify it without upgrades automatically
    stomping local changes, LP: #559194
* 15-eucalyptus-url, eucalyptus-cc.install, eucalyptus-common.install:
  install in the eucalyptus-common package, improve logic of determining
  if on CLC

Show diffs side-by-side

added added

removed removed

Lines of Context:
1034
1034
                                String returnValue = "";
1035
1035
                                int timeout = 300;
1036
1036
                                if(pid > 0) {
1037
 
                                        for(int i=0; i < 5; ++i) {
1038
 
                                                returnValue = aoeStatus(pid);
 
1037
                                        for(int i=0; i < 3; ++i) {
 
1038
                                                returnValue = aoeStatus(pid);                                           
1039
1039
                                                if(returnValue.length() == 0) {
1040
1040
                                                        success = false;
1041
 
                                                        try {
1042
 
                                                                Thread.sleep(timeout);
1043
 
                                                        } catch(InterruptedException ie) {
1044
 
                                                                LOG.error(ie);
1045
 
                                                        }
1046
 
                                                        timeout += 300;
1047
1041
                                                } else {
1048
1042
                                                        success = true;
1049
 
                                                        break;
 
1043
                                                }
 
1044
                                                try {
 
1045
                                                        Thread.sleep(timeout);
 
1046
                                                } catch(InterruptedException ie) {
 
1047
                                                        LOG.error(ie);
1050
1048
                                                }
1051
1049
                                        }
1052
1050
                                }