OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removing locking on requests in MySQLAssetData. 

These locks are not necessary since the connection is taken from the underlying mysql pool and not shared.
Such locking is already not done by some other parts of OpenSim.Data.MySQL.
Pointed out by arribasim-dev
bullet-2.82
Justin Clark-Casey (justincc) 2014-08-22 19:46:46 +01:00
parent 4e03d352c3
commit f129b824c3
1 changed files with 144 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
OpenSim/Data/MySQL/MySQLAssetData.cs
View File

@ -45,7 +45,6 @@ namespace OpenSim.Data.MySQL
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string m_connectionString; private string m_connectionString;
private object m_dbLock = new object();
protected virtual Assembly Assembly protected virtual Assembly Assembly
{ {
@ -107,47 +106,46 @@ namespace OpenSim.Data.MySQL
override public AssetBase GetAsset(UUID assetID) override public AssetBase GetAsset(UUID assetID)
{ {
AssetBase asset = null; AssetBase asset = null;
lock (m_dbLock)
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) dbcon.Open();
using (MySqlCommand cmd = new MySqlCommand(
"SELECT name, description, assetType, local, temporary, asset_flags, CreatorID, data FROM assets WHERE id=?id",
dbcon))
{ {
dbcon.Open(); cmd.Parameters.AddWithValue("?id", assetID.ToString());
using (MySqlCommand cmd = new MySqlCommand( try
"SELECT name, description, assetType, local, temporary, asset_flags, CreatorID, data FROM assets WHERE id=?id",
dbcon))
{ {
cmd.Parameters.AddWithValue("?id", assetID.ToString()); using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
try
{ {
using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow)) if (dbReader.Read())
{ {
if (dbReader.Read()) asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"], dbReader["CreatorID"].ToString());
{ asset.Data = (byte[])dbReader["data"];
asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"], dbReader["CreatorID"].ToString()); asset.Description = (string)dbReader["description"];
asset.Data = (byte[])dbReader["data"];
asset.Description = (string)dbReader["description"];
string local = dbReader["local"].ToString(); string local = dbReader["local"].ToString();
if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase)) if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase))
asset.Local = true; asset.Local = true;
else else
asset.Local = false; asset.Local = false;
asset.Temporary = Convert.ToBoolean(dbReader["temporary"]); asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]); asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
}
} }
} }
catch (Exception e) }
{ catch (Exception e)
m_log.Error( {
string.Format("[ASSETS DB]: MySql failure fetching asset {0}. Exception ", assetID), e); m_log.Error(
} string.Format("[ASSETS DB]: MySql failure fetching asset {0}. Exception ", assetID), e);
} }
} }
} }
return asset; return asset;
} }
@ -158,100 +156,94 @@ namespace OpenSim.Data.MySQL
/// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
override public void StoreAsset(AssetBase asset) override public void StoreAsset(AssetBase asset)
{ {
lock (m_dbLock) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) dbcon.Open();
{
dbcon.Open();
using (MySqlCommand cmd = using (MySqlCommand cmd =
new MySqlCommand( new MySqlCommand(
"replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, asset_flags, CreatorID, data)" + "replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, asset_flags, CreatorID, data)" +
"VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?CreatorID, ?data)", "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?CreatorID, ?data)",
dbcon)) dbcon))
{
string assetName = asset.Name;
if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
{ {
string assetName = asset.Name; assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
if (asset.Name.Length > AssetBase.MAX_ASSET_NAME) m_log.WarnFormat(
"[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
asset.Name, asset.ID, asset.Name.Length, assetName.Length);
}
string assetDescription = asset.Description;
if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
{
assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
m_log.WarnFormat(
"[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
}
try
{
using (cmd)
{ {
assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME); // create unix epoch time
m_log.WarnFormat( int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
"[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", cmd.Parameters.AddWithValue("?id", asset.ID);
asset.Name, asset.ID, asset.Name.Length, assetName.Length); cmd.Parameters.AddWithValue("?name", assetName);
} cmd.Parameters.AddWithValue("?description", assetDescription);
cmd.Parameters.AddWithValue("?assetType", asset.Type);
string assetDescription = asset.Description; cmd.Parameters.AddWithValue("?local", asset.Local);
if (asset.Description.Length > AssetBase.MAX_ASSET_DESC) cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
{ cmd.Parameters.AddWithValue("?create_time", now);
assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC); cmd.Parameters.AddWithValue("?access_time", now);
m_log.WarnFormat( cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
"[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
asset.Description, asset.ID, asset.Description.Length, assetDescription.Length); cmd.Parameters.AddWithValue("?data", asset.Data);
} cmd.ExecuteNonQuery();
try
{
using (cmd)
{
// create unix epoch time
int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
cmd.Parameters.AddWithValue("?id", asset.ID);
cmd.Parameters.AddWithValue("?name", assetName);
cmd.Parameters.AddWithValue("?description", assetDescription);
cmd.Parameters.AddWithValue("?assetType", asset.Type);
cmd.Parameters.AddWithValue("?local", asset.Local);
cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
cmd.Parameters.AddWithValue("?create_time", now);
cmd.Parameters.AddWithValue("?access_time", now);
cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
cmd.Parameters.AddWithValue("?data", asset.Data);
cmd.ExecuteNonQuery();
}
}
catch (Exception e)
{
m_log.Error(
string.Format(
"[ASSET DB]: MySQL failure creating asset {0} with name {1}. Exception ",
asset.FullID, asset.Name)
, e);
} }
} }
catch (Exception e)
{
m_log.Error(
string.Format(
"[ASSET DB]: MySQL failure creating asset {0} with name {1}. Exception ",
asset.FullID, asset.Name)
, e);
}
} }
} }
} }
private void UpdateAccessTime(AssetBase asset) private void UpdateAccessTime(AssetBase asset)
{ {
lock (m_dbLock) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) dbcon.Open();
{
dbcon.Open();
using (MySqlCommand cmd using (MySqlCommand cmd
= new MySqlCommand("update assets set access_time=?access_time where id=?id", dbcon)) = new MySqlCommand("update assets set access_time=?access_time where id=?id", dbcon))
{
try
{ {
try using (cmd)
{ {
using (cmd) // create unix epoch time
{ int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
// create unix epoch time cmd.Parameters.AddWithValue("?id", asset.ID);
int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow); cmd.Parameters.AddWithValue("?access_time", now);
cmd.Parameters.AddWithValue("?id", asset.ID); cmd.ExecuteNonQuery();
cmd.Parameters.AddWithValue("?access_time", now);
cmd.ExecuteNonQuery();
}
}
catch (Exception e)
{
m_log.Error(
string.Format(
"[ASSETS DB]: Failure updating access_time for asset {0} with name {1}. Exception ",
asset.FullID, asset.Name),
e);
} }
} }
catch (Exception e)
{
m_log.Error(
string.Format(
"[ASSETS DB]: Failure updating access_time for asset {0} with name {1}. Exception ",
asset.FullID, asset.Name),
e);
}
} }
} }
} }
@ -271,20 +263,17 @@ namespace OpenSim.Data.MySQL
string ids = "'" + string.Join("','", uuids) + "'"; string ids = "'" + string.Join("','", uuids) + "'";
string sql = string.Format("SELECT id FROM assets WHERE id IN ({0})", ids); string sql = string.Format("SELECT id FROM assets WHERE id IN ({0})", ids);
lock (m_dbLock) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) dbcon.Open();
using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
{ {
dbcon.Open(); using (MySqlDataReader dbReader = cmd.ExecuteReader())
using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
{ {
using (MySqlDataReader dbReader = cmd.ExecuteReader()) while (dbReader.Read())
{ {
while (dbReader.Read()) UUID id = DBGuid.FromDB(dbReader["id"]);
{ exist.Add(id);
UUID id = DBGuid.FromDB(dbReader["id"]);
exist.Add(id);
}
} }
} }
} }
@ -309,50 +298,47 @@ namespace OpenSim.Data.MySQL
{ {
List<AssetMetadata> retList = new List<AssetMetadata>(count); List<AssetMetadata> retList = new List<AssetMetadata>(count);
lock (m_dbLock) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) dbcon.Open();
{
dbcon.Open();
using (MySqlCommand cmd using (MySqlCommand cmd
= new MySqlCommand( = new MySqlCommand(
"SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count", "SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count",
dbcon)) dbcon))
{
cmd.Parameters.AddWithValue("?start", start);
cmd.Parameters.AddWithValue("?count", count);
try
{ {
cmd.Parameters.AddWithValue("?start", start); using (MySqlDataReader dbReader = cmd.ExecuteReader())
cmd.Parameters.AddWithValue("?count", count);
try
{ {
using (MySqlDataReader dbReader = cmd.ExecuteReader()) while (dbReader.Read())
{ {
while (dbReader.Read()) AssetMetadata metadata = new AssetMetadata();
{ metadata.Name = (string)dbReader["name"];
AssetMetadata metadata = new AssetMetadata(); metadata.Description = (string)dbReader["description"];
metadata.Name = (string)dbReader["name"]; metadata.Type = (sbyte)dbReader["assetType"];
metadata.Description = (string)dbReader["description"]; metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
metadata.Type = (sbyte)dbReader["assetType"]; metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct. metadata.FullID = DBGuid.FromDB(dbReader["id"]);
metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]); metadata.CreatorID = dbReader["CreatorID"].ToString();
metadata.FullID = DBGuid.FromDB(dbReader["id"]);
metadata.CreatorID = dbReader["CreatorID"].ToString(); // Current SHA1s are not stored/computed.
metadata.SHA1 = new byte[] { };
// Current SHA1s are not stored/computed.
metadata.SHA1 = new byte[] { }; retList.Add(metadata);
retList.Add(metadata);
}
} }
} }
catch (Exception e) }
{ catch (Exception e)
m_log.Error( {
string.Format( m_log.Error(
"[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}. Exception ", string.Format(
start, count), "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}. Exception ",
e); start, count),
} e);
} }
} }
} }
@ -362,17 +348,14 @@ namespace OpenSim.Data.MySQL
public override bool Delete(string id) public override bool Delete(string id)
{ {
lock (m_dbLock) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) dbcon.Open();
{
dbcon.Open();
using (MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon)) using (MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon))
{ {
cmd.Parameters.AddWithValue("?id", id); cmd.Parameters.AddWithValue("?id", id);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
}
} }
} }