Thank you dslake for diagnosing and fixing a race condition in OGS1SecureInventoryServer (mantis #3483). The provided patch was slightly modified to narrow the locking scope to smaller portions of the functions. Applied the same locking to HGInventoryService, which suffered from the same race condition.
diva
parent
b824e488ba
commit
8e08dd20dc
|
|
@ -77,52 +77,54 @@ namespace OpenSim.Region.Communications.Hypergrid
|
||||||
}
|
}
|
||||||
|
|
||||||
// grid/hypergrid mode
|
// grid/hypergrid mode
|
||||||
if (!m_RequestingInventory.ContainsKey(userID))
|
lock (m_RequestingInventory)
|
||||||
{
|
{
|
||||||
m_RequestingInventory.Add(userID, callback);
|
if (!m_RequestingInventory.ContainsKey(userID))
|
||||||
|
|
||||||
string invServer = GetUserInventoryURI(userID);
|
|
||||||
m_log.InfoFormat(
|
|
||||||
"[HGrid INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1} ({2})",
|
|
||||||
/*_inventoryServerUrl*/ invServer, userID, userID.Guid);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
{
|
||||||
|
m_RequestingInventory.Add(userID, callback);
|
||||||
//RestSessionObjectPosterResponse<Guid, InventoryCollection> requester
|
|
||||||
// = new RestSessionObjectPosterResponse<Guid, InventoryCollection>();
|
|
||||||
//requester.ResponseCallback = InventoryResponse;
|
|
||||||
|
|
||||||
//requester.BeginPostObject(invServer + "/GetInventory/", userID.Guid, session_id.ToString(), userID.ToString());
|
|
||||||
GetInventoryDelegate d = GetInventoryAsync;
|
|
||||||
d.BeginInvoke(invServer, userID, session_id, GetInventoryCompleted, d);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (WebException e)
|
else
|
||||||
{
|
{
|
||||||
if (StatsManager.SimExtraStats != null)
|
m_log.ErrorFormat("[HGrid INVENTORY SERVICE]: RequestInventoryForUser() - could not find user profile for {0}", userID);
|
||||||
StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure();
|
return;
|
||||||
|
|
||||||
m_log.ErrorFormat("[HGrid INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
|
|
||||||
e.Source, e.Message);
|
|
||||||
|
|
||||||
// Well, let's synthesize one
|
|
||||||
InventoryCollection icol = new InventoryCollection();
|
|
||||||
icol.UserID = userID;
|
|
||||||
icol.Items = new List<InventoryItemBase>();
|
|
||||||
icol.Folders = new List<InventoryFolderBase>();
|
|
||||||
InventoryFolderBase rootFolder = new InventoryFolderBase();
|
|
||||||
rootFolder.ID = UUID.Random();
|
|
||||||
rootFolder.Owner = userID;
|
|
||||||
icol.Folders.Add(rootFolder);
|
|
||||||
InventoryResponse(icol);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
string invServer = GetUserInventoryURI(userID);
|
||||||
|
m_log.InfoFormat(
|
||||||
|
"[HGrid INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1} ({2})",
|
||||||
|
/*_inventoryServerUrl*/ invServer, userID, userID.Guid);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("[HGrid INVENTORY SERVICE]: RequestInventoryForUser() - could not find user profile for {0}", userID);
|
|
||||||
|
//RestSessionObjectPosterResponse<Guid, InventoryCollection> requester
|
||||||
|
// = new RestSessionObjectPosterResponse<Guid, InventoryCollection>();
|
||||||
|
//requester.ResponseCallback = InventoryResponse;
|
||||||
|
|
||||||
|
//requester.BeginPostObject(invServer + "/GetInventory/", userID.Guid, session_id.ToString(), userID.ToString());
|
||||||
|
GetInventoryDelegate d = GetInventoryAsync;
|
||||||
|
d.BeginInvoke(invServer, userID, session_id, GetInventoryCompleted, d);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
if (StatsManager.SimExtraStats != null)
|
||||||
|
StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure();
|
||||||
|
|
||||||
|
m_log.ErrorFormat("[HGrid INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
|
||||||
|
e.Source, e.Message);
|
||||||
|
|
||||||
|
// Well, let's synthesize one
|
||||||
|
InventoryCollection icol = new InventoryCollection();
|
||||||
|
icol.UserID = userID;
|
||||||
|
icol.Items = new List<InventoryItemBase>();
|
||||||
|
icol.Folders = new List<InventoryFolderBase>();
|
||||||
|
InventoryFolderBase rootFolder = new InventoryFolderBase();
|
||||||
|
rootFolder.ID = UUID.Random();
|
||||||
|
rootFolder.Owner = userID;
|
||||||
|
icol.Folders.Add(rootFolder);
|
||||||
|
InventoryResponse(icol);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private delegate InventoryCollection GetInventoryDelegate(string url, UUID userID, UUID sessionID);
|
private delegate InventoryCollection GetInventoryDelegate(string url, UUID userID, UUID sessionID);
|
||||||
|
|
@ -447,62 +449,66 @@ namespace OpenSim.Region.Communications.Hypergrid
|
||||||
private void InventoryResponse(InventoryCollection response)
|
private void InventoryResponse(InventoryCollection response)
|
||||||
{
|
{
|
||||||
UUID userID = response.UserID;
|
UUID userID = response.UserID;
|
||||||
if (m_RequestingInventory.ContainsKey(userID))
|
InventoryReceiptCallback callback = null;
|
||||||
|
lock (m_RequestingInventory)
|
||||||
{
|
{
|
||||||
m_log.InfoFormat("[HGrid INVENTORY SERVICE]: " +
|
if (m_RequestingInventory.ContainsKey(userID))
|
||||||
"Received inventory response for user {0} containing {1} folders and {2} items",
|
|
||||||
userID, response.Folders.Count, response.Items.Count);
|
|
||||||
|
|
||||||
InventoryFolderImpl rootFolder = null;
|
|
||||||
InventoryReceiptCallback callback = m_RequestingInventory[userID];
|
|
||||||
|
|
||||||
ICollection<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();
|
|
||||||
ICollection<InventoryItemBase> items = new List<InventoryItemBase>();
|
|
||||||
|
|
||||||
foreach (InventoryFolderBase folder in response.Folders)
|
|
||||||
{
|
{
|
||||||
if (folder.ParentID == UUID.Zero)
|
m_log.InfoFormat("[HGrid INVENTORY SERVICE]: " +
|
||||||
{
|
"Received inventory response for user {0} containing {1} folders and {2} items",
|
||||||
rootFolder = new InventoryFolderImpl(folder);
|
userID, response.Folders.Count, response.Items.Count);
|
||||||
folders.Add(rootFolder);
|
callback = m_RequestingInventory[userID];
|
||||||
|
m_RequestingInventory.Remove(userID);
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (rootFolder != null)
|
|
||||||
{
|
|
||||||
foreach (InventoryFolderBase folder in response.Folders)
|
|
||||||
{
|
|
||||||
if (folder.ID != rootFolder.ID)
|
|
||||||
{
|
|
||||||
folders.Add(new InventoryFolderImpl(folder));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (InventoryItemBase item in response.Items)
|
|
||||||
{
|
|
||||||
items.Add(item);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("[HGrid INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID);
|
m_log.WarnFormat(
|
||||||
|
"[HGrid INVENTORY SERVICE]: " +
|
||||||
|
"Received inventory response for {0} for which we do not have a record of requesting!",
|
||||||
|
userID);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
InventoryFolderImpl rootFolder = null;
|
||||||
|
|
||||||
|
ICollection<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();
|
||||||
|
ICollection<InventoryItemBase> items = new List<InventoryItemBase>();
|
||||||
|
|
||||||
|
foreach (InventoryFolderBase folder in response.Folders)
|
||||||
|
{
|
||||||
|
if (folder.ParentID == UUID.Zero)
|
||||||
|
{
|
||||||
|
rootFolder = new InventoryFolderImpl(folder);
|
||||||
|
folders.Add(rootFolder);
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rootFolder != null)
|
||||||
|
{
|
||||||
|
foreach (InventoryFolderBase folder in response.Folders)
|
||||||
|
{
|
||||||
|
if (folder.ID != rootFolder.ID)
|
||||||
|
{
|
||||||
|
folders.Add(new InventoryFolderImpl(folder));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_RequestingInventory.Remove(userID);
|
foreach (InventoryItemBase item in response.Items)
|
||||||
callback(folders, items);
|
{
|
||||||
|
items.Add(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.WarnFormat(
|
m_log.ErrorFormat("[HGrid INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID);
|
||||||
"[HGrid INVENTORY SERVICE]: " +
|
|
||||||
"Received inventory response for {0} for which we do not have a record of requesting!",
|
|
||||||
userID);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
callback(folders, items);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private bool IsLocalStandaloneUser(UUID userID)
|
private bool IsLocalStandaloneUser(UUID userID)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -69,34 +69,36 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
/// <param name="callback"></param>
|
/// <param name="callback"></param>
|
||||||
public void RequestInventoryForUser(UUID userID, UUID session_id, InventoryReceiptCallback callback)
|
public void RequestInventoryForUser(UUID userID, UUID session_id, InventoryReceiptCallback callback)
|
||||||
{
|
{
|
||||||
if (!m_RequestingInventory.ContainsKey(userID))
|
lock (m_RequestingInventory)
|
||||||
{
|
{
|
||||||
m_RequestingInventory.Add(userID, callback);
|
if (!m_RequestingInventory.ContainsKey(userID))
|
||||||
|
m_RequestingInventory.Add(userID, callback);
|
||||||
try
|
else
|
||||||
{
|
{
|
||||||
m_log.InfoFormat(
|
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID);
|
||||||
"[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}",
|
return;
|
||||||
_inventoryServerUrl, userID);
|
|
||||||
|
|
||||||
RestSessionObjectPosterResponse<Guid, InventoryCollection> requester
|
|
||||||
= new RestSessionObjectPosterResponse<Guid, InventoryCollection>();
|
|
||||||
requester.ResponseCallback = InventoryResponse;
|
|
||||||
|
|
||||||
requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.Guid, session_id.ToString(), userID.ToString());
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
if (StatsManager.SimExtraStats != null)
|
|
||||||
StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure();
|
|
||||||
|
|
||||||
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
|
|
||||||
e.Source, e.Message);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID);
|
m_log.InfoFormat(
|
||||||
|
"[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}",
|
||||||
|
_inventoryServerUrl, userID);
|
||||||
|
|
||||||
|
RestSessionObjectPosterResponse<Guid, InventoryCollection> requester
|
||||||
|
= new RestSessionObjectPosterResponse<Guid, InventoryCollection>();
|
||||||
|
requester.ResponseCallback = InventoryResponse;
|
||||||
|
|
||||||
|
requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.Guid, session_id.ToString(), userID.ToString());
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
if (StatsManager.SimExtraStats != null)
|
||||||
|
StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure();
|
||||||
|
|
||||||
|
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
|
||||||
|
e.Source, e.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -107,60 +109,66 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
private void InventoryResponse(InventoryCollection response)
|
private void InventoryResponse(InventoryCollection response)
|
||||||
{
|
{
|
||||||
UUID userID = response.UserID;
|
UUID userID = response.UserID;
|
||||||
if (m_RequestingInventory.ContainsKey(userID))
|
InventoryReceiptCallback callback = null;
|
||||||
|
lock (m_RequestingInventory)
|
||||||
{
|
{
|
||||||
m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " +
|
if (m_RequestingInventory.ContainsKey(userID))
|
||||||
"Received inventory response for user {0} containing {1} folders and {2} items",
|
|
||||||
userID, response.Folders.Count, response.Items.Count);
|
|
||||||
|
|
||||||
InventoryFolderImpl rootFolder = null;
|
|
||||||
InventoryReceiptCallback callback = m_RequestingInventory[userID];
|
|
||||||
|
|
||||||
ICollection<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();
|
|
||||||
ICollection<InventoryItemBase> items = new List<InventoryItemBase>();
|
|
||||||
|
|
||||||
foreach (InventoryFolderBase folder in response.Folders)
|
|
||||||
{
|
{
|
||||||
if (folder.ParentID == UUID.Zero)
|
callback = m_RequestingInventory[userID];
|
||||||
{
|
m_RequestingInventory.Remove(userID);
|
||||||
rootFolder = new InventoryFolderImpl(folder);
|
|
||||||
folders.Add(rootFolder);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (rootFolder != null)
|
|
||||||
{
|
|
||||||
foreach (InventoryFolderBase folder in response.Folders)
|
|
||||||
{
|
|
||||||
if (folder.ID != rootFolder.ID)
|
|
||||||
{
|
|
||||||
folders.Add(new InventoryFolderImpl(folder));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (InventoryItemBase item in response.Items)
|
|
||||||
{
|
|
||||||
items.Add(item);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID);
|
m_log.WarnFormat(
|
||||||
|
"[OGS1 INVENTORY SERVICE]: " +
|
||||||
|
"Received inventory response for {0} for which we do not have a record of requesting!",
|
||||||
|
userID);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " +
|
||||||
|
"Received inventory response for user {0} containing {1} folders and {2} items",
|
||||||
|
userID, response.Folders.Count, response.Items.Count);
|
||||||
|
|
||||||
|
InventoryFolderImpl rootFolder = null;
|
||||||
|
|
||||||
|
ICollection<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();
|
||||||
|
ICollection<InventoryItemBase> items = new List<InventoryItemBase>();
|
||||||
|
|
||||||
|
foreach (InventoryFolderBase folder in response.Folders)
|
||||||
|
{
|
||||||
|
if (folder.ParentID == UUID.Zero)
|
||||||
|
{
|
||||||
|
rootFolder = new InventoryFolderImpl(folder);
|
||||||
|
folders.Add(rootFolder);
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rootFolder != null)
|
||||||
|
{
|
||||||
|
foreach (InventoryFolderBase folder in response.Folders)
|
||||||
|
{
|
||||||
|
if (folder.ID != rootFolder.ID)
|
||||||
|
{
|
||||||
|
folders.Add(new InventoryFolderImpl(folder));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
callback(folders, items);
|
foreach (InventoryItemBase item in response.Items)
|
||||||
|
{
|
||||||
m_RequestingInventory.Remove(userID);
|
items.Add(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.WarnFormat(
|
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID);
|
||||||
"[OGS1 INVENTORY SERVICE]: " +
|
|
||||||
"Received inventory response for {0} for which we do not have a record of requesting!",
|
|
||||||
userID);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
callback(folders, items);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue