0001-create-a-way-to-initialize-without-service-start.patch - OpenNebula - OpenNebula Development pages

          */
         void start();
         /**
          *  Initialize the database
          */
         void init();
         // -----------------------------------------------------------------------
         // Configuration attributes (read from oned.conf)
         // -----------------------------------------------------------------------

     fi
     # Start the one daemon
     $ONED -f 2>&1 &
     $ONED -i 2>&1 &
     STARTED=$?
     CURPID=$!
-...
     fi
     # Give oned a chance to do it's thing...
     sleep 2
     sleep 5
     # OK we're all done here
     # Just in case the process gets stuck, kill it
     kill -TERM $CURPID > /dev/null 2>&1
     counter=0
-...
     done
     # If the lock file is left over remove it
     rm -f /var/lol/one/one
     rm -f /var/lock/one/one

     #include <stdlib.h>
     #include <stdexcept>
     #include <libxml/parser.h>
     #include <errno.h>
     #include <signal.h>
     #include <unistd.h>
     #include <fcntl.h>
-...
     int SystemDB::check_db_version()
+    {
         int             rc;
         ostringstream   oss;
         string loaded_db_version = "";
-...
         oss.str("");
         unset_callback();
         if( loaded_db_version == "" )
+        {
             // Table user_pool is present for all OpenNebula versions, and it
             // always contains at least the oneadmin user.
             oss << "SELECT MAX(oid) FROM user_pool";
             rc = db->exec(oss);
             oss.str("");
             if( rc != 0 )   // Database needs bootstrap
+            {
                 return -2;
+            }
+        }
         if( Nebula::db_version() != loaded_db_version )
+        {
             oss << "Database version mismatch. "
-...
     /* -------------------------------------------------------------------------- */
     /* -------------------------------------------------------------------------- */
     void Nebula::start()
     void Nebula::init()
+    {
         int             rc;
         int             fd;
         sigset_t        mask;
         int             signal;
         char            hn[80];
         string          scripts_remote_dir;
         if ( gethostname(hn,79) != 0 )
+        {
             throw runtime_error("Error getting hostname");
+        }
         hostname = hn;
         int    rc;
         string scripts_remote_dir;
         // -----------------------------------------------------------
         // Configuration
-...
             int  rc;
             bool   db_is_sqlite = true;
             bool   bootstrap_db = false;
             string server  = "localhost";
             string port_str;
-...
             if ( db_is_sqlite )
+            {
                 string  db_name = var_location + "one.db";
                 db_name = var_location + "one.db";
                 rc = access(db_name.c_str(), R_OK|W_OK|F_OK);
                 if (rc == -1)
+                {
                     if (errno == ENOENT)
+                    {
                         bootstrap_db = true;
+                    }
                     else
+                    {
                         throw runtime_error("Could not acces one.db file");
+                    }
+                }
                 db = new SqliteDB(db_name);
+            }
             else
-...
                 ostringstream   oss;
                 db = new MySqlDB(server,port,user,passwd,db_name);
                 oss << "USE " << db_name;
                 rc = db->exec(oss);
                 if ( rc == 1044 )
+                {
                     oss.str("");
                     oss << "CREATE DATABASE " << db_name;
                     rc = db->exec(oss);
                     if ( rc == 0 )
+                    {
                         bootstrap_db = true;
+                    }
                     else if ( rc == 1044 )
+                    {
                         throw runtime_error("Could not create database.");
+                    }
+                }
                 else if ( rc != 0 )
+                {
                     throw runtime_error("Could not open database.");
+                }
+            }
             // ---------------------------------------------------------------------
             // Prepare the SystemDB and check versions
             // ---------------------------------------------------------------------
             NebulaLog::log("ONE",Log::INFO,"Checking database version.");
             system_db = new SystemDB(db);
             rc = system_db->check_db_version();
             if( rc == -1 )
+            {
                 throw runtime_error("Database version mismatch.");
+            }
             if( rc == -2 )
+            {
             if (bootstrap_db) {
                 rc = 0;
                 NebulaLog::log("ONE",Log::INFO,"Bootstrapping OpenNebula database.");
                 NebulaLog::log("ONE",Log::INFO,
                                "Bootstrapping OpenNebula database.");
                 rc += VirtualMachinePool::bootstrap(db);
                 rc += HostPool::bootstrap(db);
-...
                 if ( rc != 0 )
+                {
                     throw runtime_error("Error bootstrapping database.");
+                }
+                }
+            }
             NebulaLog::log("ONE",Log::INFO,"Checking database version.");
             rc = system_db->check_db_version();
             if( rc == -1 )
+            {
                 throw runtime_error("Database version mismatch.");
+            }
+        }
         catch (exception&)
+        {
             throw;
+        }
+    }
     /* -------------------------------------------------------------------------- */
     /* -------------------------------------------------------------------------- */
     void Nebula::start()
+    {
         int             rc;
         int             fd;
         sigset_t        mask;
         int             signal;
         char            hn[80];
         if ( gethostname(hn,79) != 0 )
+        {
             throw runtime_error("Error getting hostname");
+        }
         hostname = hn;
         Nebula::init();
         try
+        {

     "SYNOPSIS\n"
     "  Starts the OpenNebula daemon\n\n"
     "OPTIONS\n"
     "\t-h\tprints this help.\n"
     "\t-v\tprints OpenNebula version and license\n"
     "\t-f\tforeground, do not fork the oned daemon\n";
     "\t-h\tprints this help.\n"
     "\t-f\tforeground, do not fork the oned daemon\n"
     "\t-i\tinitialize the dabase and exit.\n";
     static const char * susage =
     "usage: oned [-h] [-v] [-f]\n";
-...
             << "(http://www.apache.org/licenses/LICENSE-2.0).\n";
+    }
     /* ------------------------------------------------------------------------- */
     /* ------------------------------------------------------------------------- */
     static void oned_init()
+    {
         try
+        {
             Nebula& nd  = Nebula::instance();
             nd.init();
+        }
         catch (exception &e)
+        {
             cerr << e.what() << endl;
             return;
+        }
+    }
     /* -------------------------------------------------------------------------- */
     /* -------------------------------------------------------------------------- */
-...
         string          wd;
         int             rc;
         while((opt = getopt(argc,argv,"vhf")) != -1)
         while((opt = getopt(argc,argv,"vhif")) != -1)
             switch(opt)
+            {
                 case 'v':
-...
                     cout << usage;
                     exit(0);
                     break;
                 case 'i':
                     oned_init();
                     exit(0);
                     break;
                 case 'f':
                     foreground = true;
                     break;

             free_db_connection(db);
             return -1;
             return err_num;
+        }
-...
                 free_db_connection(db);
                 return -1;
                 return err_num;
+            }
             // Fetch the names of the fields
+    -