Port the safer database access and the cure for "Chicken Bones" which

are artefacts that can be created by fsck and would make standard
FSAssets choke. These refinements were tested on OSGrid.

OpenSim/Data/MySQL/MySQLFSAssetData.cs

@@ -41,10 +41,8 @@ namespace OpenSim.Data.MySQL
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected MySqlConnection m_Connection = null;
         protected string m_ConnectionString;
         protected string m_Table;
-        protected Object m_connLock = new Object();
 
         /// <summary>
         /// Number of days that must pass before we update the access time on an asset when it has been fetched
@@ -75,10 +73,11 @@ namespace OpenSim.Data.MySQL
 
             try
             {
-                OpenDatabase();
+                using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
-
+                {
-                Migration m = new Migration(m_Connection, Assembly, "FSAssetStore");
+                    Migration m = new Migration(conn, Assembly, "FSAssetStore");
-                m.Update();
+                    m.Update();
+                }
             }
             catch (MySqlException e)
             {
@@ -100,135 +99,113 @@ namespace OpenSim.Data.MySQL
 
         #endregion
 
-        private bool OpenDatabase()
+        private bool ExecuteNonQuery(MySqlCommand cmd)
         {
-            try
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
             {
-                m_Connection = new MySqlConnection(m_ConnectionString);
+                try
+                {
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Database open failed with {0}", e.ToString());
+                    return false;
+                }
 
-                m_Connection.Open();
+                cmd.Connection = conn;
-            }
+                try
-            catch (MySqlException e)
+                {
-            {
+                    cmd.ExecuteNonQuery();
-                m_log.ErrorFormat("[FSASSETS]: Can't connect to database: {0}",
+                }
-                        e.Message.ToString());
+                catch (MySqlException e)
-
+                {
-                return false;
+                    m_log.ErrorFormat("[FSASSETS]: Query {0} failed with {1}", cmd.CommandText, e.ToString());
+                    return false;
+                }
             }
 
             return true;
         }
 
-        private IDataReader ExecuteReader(MySqlCommand c)
-        {
-            IDataReader r = null;
-            MySqlConnection connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
-            connection.Open();
-            c.Connection = connection;
-
-            r = c.ExecuteReader();
-
-            return r;
-        }
-
-        private void ExecuteNonQuery(MySqlCommand c)
-        {
-            lock (m_connLock)
-            {
-                bool errorSeen = false;
-
-                while (true)
-                {
-                    try
-                    {
-                        c.ExecuteNonQuery();
-                    }
-                    catch (MySqlException)
-                    {
-                        System.Threading.Thread.Sleep(500);
-
-                        m_Connection.Close();
-                        m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
-                        m_Connection.Open();
-                        c.Connection = m_Connection;
-
-                        if (!errorSeen)
-                        {
-                            errorSeen = true;
-                            continue;
-                        }
-                        m_log.ErrorFormat("[FSASSETS] MySQL command: {0}", c.CommandText);
-                        throw;
-                    }
-
-                    break;
-                }
-            }
-        }
-
         #region IFSAssetDataPlugin Members
 
         public AssetMetadata Get(string id, out string hash)
         {
             hash = String.Empty;
 
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, access_time, asset_flags from {0} where id = ?id", m_Table);
-            cmd.Parameters.AddWithValue("?id", id);
-
-            IDataReader reader = ExecuteReader(cmd);
-
-            if (!reader.Read())
-            {
-                reader.Close();
-                FreeCommand(cmd);
-                return null;
-            }
-            
             AssetMetadata meta = new AssetMetadata();
 
-            hash = reader["hash"].ToString();
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
+            {
+                try
+                {
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Database open failed with {0}", e.ToString());
+                    return null;
+                }
 
-            meta.ID = id;
+                using (MySqlCommand cmd = conn.CreateCommand())
-            meta.FullID = new UUID(id);
+                {
+                    cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, asset_flags from {0} where id = ?id", m_Table);
+                    cmd.Parameters.AddWithValue("?id", id);
 
-            meta.Name = reader["name"].ToString();
+                    using (IDataReader reader = cmd.ExecuteReader())
-            meta.Description = reader["description"].ToString();
+                    {
-            meta.Type = (sbyte)Convert.ToInt32(reader["type"]);
+                        if (!reader.Read())
-            meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
+                            return null;
-            meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
-            meta.Flags = (AssetFlags)Convert.ToInt32(reader["asset_flags"]);
 
-            int AccessTime = Convert.ToInt32(reader["access_time"]);
+                        hash = reader["hash"].ToString();
 
-            reader.Close();
+                        meta.ID = id;
+                        meta.FullID = new UUID(id);
 
-            UpdateAccessTime(AccessTime, cmd);
+                        meta.Name = reader["name"].ToString();
+                        meta.Description = reader["description"].ToString();
+                        meta.Type = (sbyte)Convert.ToInt32(reader["type"]);
+                        meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
+                        meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
+                        meta.Flags = (AssetFlags)Convert.ToInt32(reader["asset_flags"]);
 
-            FreeCommand(cmd);
+                        int AccessTime = Convert.ToInt32(reader["access_time"]);
+                        UpdateAccessTime(AccessTime);
+                    }
+                }
+
+            }
 
             return meta;
         }
 
-        private void UpdateAccessTime(int AccessTime, MySqlCommand cmd)
+        private void UpdateAccessTime(int AccessTime)
         {
             // Reduce DB work by only updating access time if asset hasn't recently been accessed
             // 0 By Default, Config option is "DaysBetweenAccessTimeUpdates"
             if (DaysBetweenAccessTimeUpdates > 0 && (DateTime.UtcNow - Utils.UnixTimeToDateTime(AccessTime)).TotalDays < DaysBetweenAccessTimeUpdates)
                 return;
 
-            cmd.CommandText = String.Format("UPDATE {0} SET `access_time` = UNIX_TIMESTAMP() WHERE `id` = ?id", m_Table);
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
+            {
+                try
+                {
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Database open failed with {0}", e.ToString());
+                    return;
+                }
 
-            cmd.ExecuteNonQuery();
+                using (MySqlCommand cmd = conn.CreateCommand())
-        }
+                {
+                    cmd.CommandText = String.Format("UPDATE {0} SET `access_time` = UNIX_TIMESTAMP() WHERE `id` = ?id", m_Table);
 
-        protected void FreeCommand(MySqlCommand cmd)
+                    cmd.ExecuteNonQuery();
-        {
+                }
-            MySqlConnection c = cmd.Connection;
+            }
-            cmd.Dispose();
-            c.Close();
-            c.Dispose();
         }
 
         public bool Store(AssetMetadata meta, string hash)
@@ -238,37 +215,35 @@ namespace OpenSim.Data.MySQL
                 string oldhash;
                 AssetMetadata existingAsset = Get(meta.ID, out oldhash);
 
-                MySqlCommand cmd = m_Connection.CreateCommand();
+                using (MySqlCommand cmd = new MySqlCommand())
-
-                cmd.Parameters.AddWithValue("?id", meta.ID);
-                cmd.Parameters.AddWithValue("?name", meta.Name);
-                cmd.Parameters.AddWithValue("?description", meta.Description);
-                cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
-                cmd.Parameters.AddWithValue("?hash", hash);
-                cmd.Parameters.AddWithValue("?asset_flags", meta.Flags);
-
-                if (existingAsset == null)
                 {
-                    cmd.CommandText = String.Format("insert into {0} (id, name, description, type, hash, asset_flags, create_time, access_time) values ( ?id, ?name, ?description, ?type, ?hash, ?asset_flags, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())", m_Table);
+                    cmd.Parameters.AddWithValue("?id", meta.ID);
+                    cmd.Parameters.AddWithValue("?name", meta.Name);
+                    cmd.Parameters.AddWithValue("?description", meta.Description);
+                    cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
+                    cmd.Parameters.AddWithValue("?hash", hash);
+                    cmd.Parameters.AddWithValue("?asset_flags", meta.Flags);
 
-                    ExecuteNonQuery(cmd);
+                    if (existingAsset == null)
+                    {
+                        cmd.CommandText = String.Format("insert into {0} (id, name, description, type, hash, asset_flags, create_time, access_time) values ( ?id, ?name, ?description, ?type, ?hash, ?asset_flags, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())", m_Table);
 
-                    cmd.Dispose();
+                        ExecuteNonQuery(cmd);
+
+                        return true;
+                    }
+
+                    //cmd.CommandText = String.Format("update {0} set hash = ?hash, access_time = UNIX_TIMESTAMP() where id = ?id", m_Table);
+
+                    //ExecuteNonQuery(cmd);
 
-                    return true;
                 }
-
-                //cmd.CommandText = String.Format("update {0} set hash = ?hash, access_time = UNIX_TIMESTAMP() where id = ?id", m_Table);
-
-                //ExecuteNonQuery(cmd);
-
-                cmd.Dispose();
                 return false;
             }
             catch(Exception e)
             {
                 m_log.Error("[FSAssets] Failed to store asset with ID " + meta.ID);
-		        m_log.Error(e.ToString());
+        m_log.Error(e.ToString());
                 return false;
             }
         }
@@ -283,26 +258,42 @@ namespace OpenSim.Data.MySQL
             if (uuids.Length == 0)
                 return new bool[0];
 
+            bool[] results = new bool[uuids.Length];
+            for (int i = 0; i < uuids.Length; i++)
+                results[i] = false;
+
             HashSet<UUID> exists = new HashSet<UUID>();
 
             string ids = "'" + string.Join("','", uuids) + "'";
             string sql = string.Format("select id from {1} where id in ({0})", ids, m_Table);
 
-            using (MySqlCommand cmd = m_Connection.CreateCommand())
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
             {
-                cmd.CommandText = sql;
+                try
-
-                using (MySqlDataReader dbReader = cmd.ExecuteReader())
                 {
-                    while (dbReader.Read())
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Failed to open database: {0}", e.ToString());
+                    return results;
+                }
+
+                using (MySqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = sql;
+
+                    using (MySqlDataReader dbReader = cmd.ExecuteReader())
                     {
-                        UUID id = DBGuid.FromDB(dbReader["ID"]);
+                        while (dbReader.Read())
-                        exists.Add(id);
+                        {
+                            UUID id = DBGuid.FromDB(dbReader["ID"]);
+                            exists.Add(id);
+                        }
                     }
                 }
             }
 
-            bool[] results = new bool[uuids.Length];
             for (int i = 0; i < uuids.Length; i++)
                 results[i] = exists.Contains(uuids[i]);
             return results;
@@ -310,102 +301,114 @@ namespace OpenSim.Data.MySQL
 
         public int Count()
         {
-            MySqlCommand cmd = m_Connection.CreateCommand();
+            int count = 0;
 
-            cmd.CommandText = String.Format("select count(*) as count from {0}", m_Table);
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
+            {
+                try
+                {
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Failed to open database: {0}", e.ToString());
+                    return 0;
+                }
 
-            IDataReader reader = ExecuteReader(cmd);
+                MySqlCommand cmd = conn.CreateCommand();
 
-            reader.Read();
+                cmd.CommandText = String.Format("select count(*) as count from {0}", m_Table);
 
-            int count = Convert.ToInt32(reader["count"]);
+                using (IDataReader reader = cmd.ExecuteReader())
+                {
+                    reader.Read();
 
-            reader.Close();
+                    count = Convert.ToInt32(reader["count"]);
-            FreeCommand(cmd);
+                }
+            }
 
             return count;
         }
 
         public bool Delete(string id)
         {
-            using (MySqlCommand cmd = m_Connection.CreateCommand())
+            MySqlCommand cmd = new MySqlCommand();
-            {
-                cmd.CommandText = String.Format("delete from {0} where id = ?id", m_Table);
 
-                cmd.Parameters.AddWithValue("?id", id);
+            cmd.CommandText = String.Format("delete from {0} where id = ?id", m_Table);
 
-                ExecuteNonQuery(cmd);
+            cmd.Parameters.AddWithValue("?id", id);
-            }
+
+            ExecuteNonQuery(cmd);
+
+            cmd.Dispose();
 
             return true;
         }
 
         public void Import(string conn, string table, int start, int count, bool force, FSStoreDelegate store)
         {
-            MySqlConnection importConn;
-
-            try
-            {
-                importConn = new MySqlConnection(conn);
-
-                importConn.Open();
-            }
-            catch (MySqlException e)
-            {
-                m_log.ErrorFormat("[FSASSETS]: Can't connect to database: {0}",
-                        e.Message.ToString());
-
-                return;
-            }
-
             int imported = 0;
 
-            MySqlCommand cmd = importConn.CreateCommand();
+            using (MySqlConnection importConn = new MySqlConnection(conn))
-
-            string limit = String.Empty;
-            if (count != -1)
             {
-                limit = String.Format(" limit {0},{1}", start, count);
+                try
-            }
-                
-            cmd.CommandText = String.Format("select * from {0}{1}", table, limit);
-
-            MainConsole.Instance.Output("Querying database");
-            IDataReader reader = cmd.ExecuteReader();
-
-            MainConsole.Instance.Output("Reading data");
-
-            while (reader.Read())
-            {
-                if ((imported % 100) == 0)
                 {
-                    MainConsole.Instance.Output(String.Format("{0} assets imported so far", imported));
+                    importConn.Open();
                 }
-    
+                catch (MySqlException e)
-                AssetBase asset = new AssetBase();
+                {
-                AssetMetadata meta = new AssetMetadata();
+                    m_log.ErrorFormat("[FSASSETS]: Can't connect to database: {0}",
+                            e.Message.ToString());
 
-                meta.ID = reader["id"].ToString();
+                    return;
-                meta.FullID = new UUID(meta.ID);
+                }
 
-                meta.Name = reader["name"].ToString();
+                using (MySqlCommand cmd = importConn.CreateCommand())
-                meta.Description = reader["description"].ToString();
+                {
-                meta.Type = (sbyte)Convert.ToInt32(reader["assetType"]);
+                    string limit = String.Empty;
-                meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
+                    if (count != -1)
-                meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
+                    {
+                        limit = String.Format(" limit {0},{1}", start, count);
+                    }
 
-                asset.Metadata = meta;
+                    cmd.CommandText = String.Format("select * from {0}{1}", table, limit);
-                asset.Data = (byte[])reader["data"];
 
-                store(asset, force);
+                    MainConsole.Instance.Output("Querying database");
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        MainConsole.Instance.Output("Reading data");
 
-                imported++;
+                        while (reader.Read())
+                        {
+                            if ((imported % 100) == 0)
+                            {
+                                MainConsole.Instance.Output(String.Format("{0} assets imported so far", imported));
+                            }
+
+                            AssetBase asset = new AssetBase();
+                            AssetMetadata meta = new AssetMetadata();
+
+                            meta.ID = reader["id"].ToString();
+                            meta.FullID = new UUID(meta.ID);
+
+                            meta.Name = reader["name"].ToString();
+                            meta.Description = reader["description"].ToString();
+                            meta.Type = (sbyte)Convert.ToInt32(reader["assetType"]);
+                            meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
+                            meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
+
+                            asset.Metadata = meta;
+                            asset.Data = (byte[])reader["data"];
+
+                            store(asset, force);
+
+                            imported++;
+                        }
+                    }
+
+                }
             }
 
-            reader.Close();
-            cmd.Dispose();
-            importConn.Close();
-
             MainConsole.Instance.Output(String.Format("Import done, {0} assets imported", imported));
         }
 

OpenSim/Services/FSAssetService/FSAssetService.cs

@@ -119,8 +119,8 @@ namespace OpenSim.Services.FSAssetService
 
             // Get Database Connector from Asset Config (If present)
             string dllName = assetConfig.GetString("StorageProvider", string.Empty);
-            string m_ConnectionString = assetConfig.GetString("ConnectionString", string.Empty);
+            string connectionString = assetConfig.GetString("ConnectionString", string.Empty);
-            string m_Realm = assetConfig.GetString("Realm", "fsassets");
+            string realm = assetConfig.GetString("Realm", "fsassets");
 
             int SkipAccessTimeDays = assetConfig.GetInt("DaysBetweenAccessTimeUpdates", 0);
 
@@ -132,15 +132,15 @@ namespace OpenSim.Services.FSAssetService
                 if (dllName == String.Empty)
                     dllName = dbConfig.GetString("StorageProvider", String.Empty);
                 
-                if (m_ConnectionString == String.Empty)
+                if (connectionString == String.Empty)
-                    m_ConnectionString = dbConfig.GetString("ConnectionString", String.Empty);
+                    connectionString = dbConfig.GetString("ConnectionString", String.Empty);
             }
 
             // No databse connection found in either config
             if (dllName.Equals(String.Empty))
                 throw new Exception("No StorageProvider configured");
 
-            if (m_ConnectionString.Equals(String.Empty))
+            if (connectionString.Equals(String.Empty))
                 throw new Exception("Missing database connection string");
 
             // Create Storage Provider
@@ -150,7 +150,7 @@ namespace OpenSim.Services.FSAssetService
                 throw new Exception(string.Format("Could not find a storage interface in the module {0}", dllName));
 
             // Initialize DB And perform any migrations required
-            m_DataConnector.Initialise(m_ConnectionString, m_Realm, SkipAccessTimeDays);
+            m_DataConnector.Initialise(connectionString, realm, SkipAccessTimeDays);
 
             // Setup Fallback Service
             string str = assetConfig.GetString("FallbackService", string.Empty);
@@ -232,7 +232,7 @@ namespace OpenSim.Services.FSAssetService
 
         private void Writer()
         {
-            m_log.Info("[FSASSETS]: Writer started");
+            m_log.Info("[ASSET]: Writer started");
 
             while (true)
             {
@@ -246,33 +246,98 @@ namespace OpenSim.Services.FSAssetService
                         string hash = Path.GetFileNameWithoutExtension(files[i]);
                         string s = HashToFile(hash);
                         string diskFile = Path.Combine(m_FSBase, s);
+                        bool pathOk = false;
 
-                        Directory.CreateDirectory(Path.GetDirectoryName(diskFile));
+                        // The cure for chicken bones!
-                        try
+                        while(true)
                         {
-                            byte[] data = File.ReadAllBytes(files[i]);
+                            try
-
-                            using (GZipStream gz = new GZipStream(new FileStream(diskFile + ".gz", FileMode.Create), CompressionMode.Compress))
                             {
-                                gz.Write(data, 0, data.Length);
+                                // Try to make the directory we need for this file
-                                gz.Close();
+                                Directory.CreateDirectory(Path.GetDirectoryName(diskFile));
+                                pathOk = true;
+                                break;
                             }
-                            File.Delete(files[i]);
+                            catch (System.IO.IOException)
+                            {
+                                // Creating the directory failed. This can't happen unless
+                                // a part of the path already exists as a file. Sadly the
+                                // SRAS data contains such files.
+                                string d = Path.GetDirectoryName(diskFile);
 
-                            //File.Move(files[i], diskFile);
+                                // Test each path component in turn. If we can successfully
+                                // make a directory, the level below must be the chicken bone.
+                                while (d.Length > 0)
+                                {
+                                    Console.WriteLine(d);
+                                    try
+                                    {
+                                        Directory.CreateDirectory(Path.GetDirectoryName(d));
+                                    }
+                                    catch (System.IO.IOException)
+                                    {
+                                        d = Path.GetDirectoryName(d);
+
+                                        // We failed making the directory and need to
+                                        // go up a bit more
+                                        continue;
+                                    }
+
+                                    // We succeeded in making the directory and (d) is
+                                    // the chicken bone
+                                    break;
+                                }
+
+                                // Is the chicken alive?
+                                if (d.Length > 0)
+                                {
+                                    Console.WriteLine(d);
+
+                                    FileAttributes attr = File.GetAttributes(d);
+
+                                    if ((attr & FileAttributes.Directory) == 0)
+                                    {
+                                        // The chicken bone should be resolved.
+                                        // Return to writing the file.
+                                        File.Delete(d);
+                                        continue;
+                                    }
+                                }
+                            }
+                            // Could not resolve, skipping
+                            m_log.ErrorFormat("[ASSET]: Could not resolve path creation error for {0}", diskFile);
+                            break;
                         }
-                        catch(System.IO.IOException e)
+
+                        if (pathOk)
                         {
-                            if (e.Message.StartsWith("Win32 IO returned ERROR_ALREADY_EXISTS"))
+                            try
+                            {
+                                byte[] data = File.ReadAllBytes(files[i]);
+
+                                using (GZipStream gz = new GZipStream(new FileStream(diskFile + ".gz", FileMode.Create), CompressionMode.Compress))
+                                {
+                                    gz.Write(data, 0, data.Length);
+                                    gz.Close();
+                                }
                                 File.Delete(files[i]);
-                            else
+
-                                throw;
+                                //File.Move(files[i], diskFile);
+                            }
+                            catch(System.IO.IOException e)
+                            {
+                                if (e.Message.StartsWith("Win32 IO returned ERROR_ALREADY_EXISTS"))
+                                    File.Delete(files[i]);
+                                else
+                                    throw;
+                            }
                         }
                     }
+
                     int totalTicks = System.Environment.TickCount - tickCount;
                     if (totalTicks > 0) // Wrap?
                     {
-                        m_log.InfoFormat("[FSASSETS]: Write cycle complete, {0} files, {1} ticks, avg {2:F2}", files.Length, totalTicks, (double)totalTicks / (double)files.Length);
+                        m_log.InfoFormat("[ASSET]: Write cycle complete, {0} files, {1} ticks, avg {2:F2}", files.Length, totalTicks, (double)totalTicks / (double)files.Length);
                     }
                 }
 
@@ -292,20 +357,25 @@ namespace OpenSim.Services.FSAssetService
             if (hash == null || hash.Length < 10)
                 return "junkyard";
 
+            /*
+             * The code below is the OSGrid code.
+             * This should probably become a config option.
+             */
+            /*
             return Path.Combine(hash.Substring(0, 3),
                    Path.Combine(hash.Substring(3, 3)));
+            */
+
             /*
              * The below is what core would normally use.
              * This is modified to work in OSGrid, as seen
              * above, because the SRAS data is structured
              * that way.
              */
-            /*
             return Path.Combine(hash.Substring(0, 2),
                    Path.Combine(hash.Substring(2, 2),
                    Path.Combine(hash.Substring(4, 2),
                    hash.Substring(6, 4))));
-            */
         }
 
         private bool AssetExists(string hash)