Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

onedb fsck count reserverd networks wrong #4334

Closed
7 tasks
kvaps opened this issue Mar 10, 2020 · 0 comments · Fixed by #4335
Closed
7 tasks

onedb fsck count reserverd networks wrong #4334

kvaps opened this issue Mar 10, 2020 · 0 comments · Fixed by #4335

Comments

@kvaps
Copy link
Contributor

kvaps commented Mar 10, 2020 •
edited
Loading

Description

I've already reported that in #1710 (comment):

Group 3133 quotas: VNet 23	LEASES_USED has 6 	is	0
Group 3133 quotas: VNet 111111	LEASES_USED has 0 	is	6

I have no any network with id 111111

But Group 3133 owns network 5432 with 6 address ranges:

<VNET>
  <ID>5432</ID>
  <UID>3334</UID>
  <GID>3133</GID>
  <UNAME>ov3211</UNAME>
  <GNAME>ov3211</GNAME>
  <NAME>ov3211</NAME>
  <PERMISSIONS>
    <OWNER_U>1</OWNER_U>
    <OWNER_M>1</OWNER_M>
    <OWNER_A>0</OWNER_A>
    <GROUP_U>0</GROUP_U>
    <GROUP_M>0</GROUP_M>
    <GROUP_A>0</GROUP_A>
    <OTHER_U>0</OTHER_U>
    <OTHER_M>0</OTHER_M>
    <OTHER_A>0</OTHER_A>
  </PERMISSIONS>
  <CLUSTERS>
    <ID>100</ID>
    <ID>101</ID>
    <ID>102</ID>
    <ID>103</ID>
    <ID>104</ID>
    <ID>105</ID>
  </CLUSTERS>
  <BRIDGE><![CDATA[vmbr0]]></BRIDGE>
  <BRIDGE_TYPE><![CDATA[linux]]></BRIDGE_TYPE>
  <PARENT_NETWORK_ID>23</PARENT_NETWORK_ID>
  <VN_MAD><![CDATA[802.1Q]]></VN_MAD>
  <PHYDEV><![CDATA[bond0]]></PHYDEV>
  <VLAN_ID><![CDATA[100]]></VLAN_ID>
  <OUTER_VLAN_ID/>
  <VLAN_ID_AUTOMATIC>0</VLAN_ID_AUTOMATIC>
  <OUTER_VLAN_ID_AUTOMATIC>0</OUTER_VLAN_ID_AUTOMATIC>
  <USED_LEASES>5</USED_LEASES>
  <VROUTERS/>
  <TEMPLATE>
    <BRIDGE><![CDATA[vmbr0]]></BRIDGE>
    <BRIDGE_TYPE><![CDATA[linux]]></BRIDGE_TYPE>
    <DNS><![CDATA[46.28.108.2 31.31.72.3]]></DNS>
    <FILTER_IP_SPOOFING><![CDATA[YES]]></FILTER_IP_SPOOFING>
    <FILTER_MAC_SPOOFING><![CDATA[YES]]></FILTER_MAC_SPOOFING>
    <INBOUND_AVG_BW><![CDATA[12500]]></INBOUND_AVG_BW>
    <INBOUND_PEAK_BW><![CDATA[12500]]></INBOUND_PEAK_BW>
    <INBOUND_PEAK_KB><![CDATA[12500]]></INBOUND_PEAK_KB>
    <OUTBOUND_AVG_BW><![CDATA[12500]]></OUTBOUND_AVG_BW>
    <OUTBOUND_PEAK_BW><![CDATA[12500]]></OUTBOUND_PEAK_BW>
    <OUTBOUND_PEAK_KB><![CDATA[12500]]></OUTBOUND_PEAK_KB>
    <OUTER_VLAN_ID><![CDATA[]]></OUTER_VLAN_ID>
    <PHYDEV><![CDATA[bond0]]></PHYDEV>
    <SECURITY_GROUPS><![CDATA[0]]></SECURITY_GROUPS>
    <VLAN_ID><![CDATA[100]]></VLAN_ID>
    <VN_MAD><![CDATA[802.1Q]]></VN_MAD>
  </TEMPLATE>
  <AR_POOL>
    <AR>
      <AR_ID><![CDATA[0]]></AR_ID>
      <BRIDGE><![CDATA[vmbr0v102]]></BRIDGE>
      <GATEWAY><![CDATA[XX.YY.ZZ.XX]></GATEWAY>
      <IP><![CDATA[XX.YY.ZZ.XX]></IP>
      <MAC><![CDATA[02:00:59:dd:d6:a7]]></MAC>
      <PARENT_NETWORK_AR_ID><![CDATA[1]]></PARENT_NETWORK_AR_ID>
      <SIZE><![CDATA[1]]></SIZE>
      <TYPE><![CDATA[IP4]]></TYPE>
      <VLAN_ID><![CDATA[102]]></VLAN_ID>
      <MAC_END><![CDATA[02:00:59:dd:d6:a7]]></MAC_END>
      <IP_END><![CDATA[XX.YY.ZZ.XX]></IP_END>
      <USED_LEASES>0</USED_LEASES>
      <LEASES/>
    </AR>
    <AR>
      <AR_ID><![CDATA[1]]></AR_ID>
      <BRIDGE><![CDATA[vmbr0v102]]></BRIDGE>
      <GATEWAY><![CDATA[XX.YY.ZZ.XX]></GATEWAY>
      <IP><![CDATA[XX.YY.ZZ.XX]></IP>
      <MAC><![CDATA[02:00:59:dd:d6:a9]]></MAC>
      <PARENT_NETWORK_AR_ID><![CDATA[1]]></PARENT_NETWORK_AR_ID>
      <SIZE><![CDATA[1]]></SIZE>
      <TYPE><![CDATA[IP4]]></TYPE>
      <VLAN_ID><![CDATA[102]]></VLAN_ID>
      <MAC_END><![CDATA[02:00:59:dd:d6:a9]]></MAC_END>
      <IP_END><![CDATA[XX.YY.ZZ.XX]></IP_END>
      <USED_LEASES>1</USED_LEASES>
      <LEASES>
        <LEASE>
          <IP><![CDATA[XX.YY.ZZ.XX]></IP>
          <MAC><![CDATA[02:00:59:dd:d6:a9]]></MAC>
          <VM><![CDATA[8743]]></VM>
        </LEASE>
      </LEASES>
    </AR>
    <AR>
      <AR_ID><![CDATA[2]]></AR_ID>
      <BRIDGE><![CDATA[vmbr0v102]]></BRIDGE>
      <GATEWAY><![CDATA[XX.YY.ZZ.XX]></GATEWAY>
      <IP><![CDATA[XX.YY.ZZ.XX]></IP>
      <MAC><![CDATA[02:00:59:dd:d6:aa]]></MAC>
      <PARENT_NETWORK_AR_ID><![CDATA[1]]></PARENT_NETWORK_AR_ID>
      <SIZE><![CDATA[1]]></SIZE>
      <TYPE><![CDATA[IP4]]></TYPE>
      <VLAN_ID><![CDATA[102]]></VLAN_ID>
      <MAC_END><![CDATA[02:00:59:dd:d6:aa]]></MAC_END>
      <IP_END><![CDATA[XX.YY.ZZ.XX]></IP_END>
      <USED_LEASES>1</USED_LEASES>
      <LEASES>
        <LEASE>
          <IP><![CDATA[XX.YY.ZZ.XX]></IP>
          <MAC><![CDATA[02:00:59:dd:d6:aa]]></MAC>
          <VM><![CDATA[8743]]></VM>
        </LEASE>
      </LEASES>
    </AR>
    <AR>
      <AR_ID><![CDATA[3]]></AR_ID>
      <BRIDGE><![CDATA[vmbr0v102]]></BRIDGE>
      <GATEWAY><![CDATA[XX.YY.ZZ.XX]></GATEWAY>
      <IP><![CDATA[XX.YY.ZZ.XX]></IP>
      <MAC><![CDATA[02:00:59:dd:d6:ac]]></MAC>
      <PARENT_NETWORK_AR_ID><![CDATA[1]]></PARENT_NETWORK_AR_ID>
      <SIZE><![CDATA[1]]></SIZE>
      <TYPE><![CDATA[IP4]]></TYPE>
      <VLAN_ID><![CDATA[102]]></VLAN_ID>
      <MAC_END><![CDATA[02:00:59:dd:d6:ac]]></MAC_END>
      <IP_END><![CDATA[XX.YY.ZZ.XX]></IP_END>
      <USED_LEASES>1</USED_LEASES>
      <LEASES>
        <LEASE>
          <IP><![CDATA[XX.YY.ZZ.XX]></IP>
          <MAC><![CDATA[02:00:59:dd:d6:ac]]></MAC>
          <VM><![CDATA[8743]]></VM>
        </LEASE>
      </LEASES>
    </AR>
    <AR>
      <AR_ID><![CDATA[4]]></AR_ID>
      <BRIDGE><![CDATA[vmbr0v102]]></BRIDGE>
      <GATEWAY><![CDATA[XX.YY.ZZ.XX]></GATEWAY>
      <IP><![CDATA[XX.YY.ZZ.XX]></IP>
      <MAC><![CDATA[02:00:59:dd:d6:b4]]></MAC>
      <PARENT_NETWORK_AR_ID><![CDATA[1]]></PARENT_NETWORK_AR_ID>
      <SIZE><![CDATA[1]]></SIZE>
      <TYPE><![CDATA[IP4]]></TYPE>
      <VLAN_ID><![CDATA[102]]></VLAN_ID>
      <MAC_END><![CDATA[02:00:59:dd:d6:b4]]></MAC_END>
      <IP_END><![CDATA[XX.YY.ZZ.XX]></IP_END>
      <USED_LEASES>1</USED_LEASES>
      <LEASES>
        <LEASE>
          <IP><![CDATA[XX.YY.ZZ.XX]></IP>
          <MAC><![CDATA[02:00:59:dd:d6:b4]]></MAC>
          <VM><![CDATA[8743]]></VM>
        </LEASE>
      </LEASES>
    </AR>
    <AR>
      <AR_ID><![CDATA[5]]></AR_ID>
      <BRIDGE><![CDATA[vmbr0v102]]></BRIDGE>
      <GATEWAY><![CDATA[XX.YY.ZZ.XX]></GATEWAY>
      <IP><![CDATA[XX.YY.ZZ.XX]></IP>
      <MAC><![CDATA[02:00:59:dd:d6:b6]]></MAC>
      <PARENT_NETWORK_AR_ID><![CDATA[1]]></PARENT_NETWORK_AR_ID>
      <SIZE><![CDATA[1]]></SIZE>
      <TYPE><![CDATA[IP4]]></TYPE>
      <VLAN_ID><![CDATA[102]]></VLAN_ID>
      <MAC_END><![CDATA[02:00:59:dd:d6:b6]]></MAC_END>
      <IP_END><![CDATA[XX.YY.ZZ.XX]></IP_END>
      <USED_LEASES>1</USED_LEASES>
      <LEASES>
        <LEASE>
          <IP><![CDATA[XX.YY.ZZ.XX]></IP>
          <MAC><![CDATA[02:00:59:dd:d6:b6]]></MAC>
          <VM><![CDATA[8743]]></VM>
        </LEASE>
      </LEASES>
    </AR>
  </AR_POOL>
</VNET>

thus it is taking PARENT_NETWORK by counting AR/PARENT_NETWORK_AR_ID's like: 1 + 1 + 1 + 1 + 1 + 1 = 111111, but it is wrong, it should use common PARENT_NETWORK_ID instead

To Reproduce
Steps to reproduce the behavior.

Expected behavior
A clear and concise description of what you expected to happen.

Details

  • Affected Component: onedb fsck
  • Hypervisor: KVM
  • Version: 5.10.3

Additional context

one/src/onedb/fsck/quotas.rb

Lines 470 to 484 in b16ea97

# Calculate quotas for reserved networks
@db.fetch(queries[2]) do |vnet_row|
vnet_doc = nokogiri_doc(vnet_row[:body])
vnet_doc.xpath('VNET/AR_POOL').each do |ar|
parent_id = ar.xpath('AR/PARENT_NETWORK_AR_ID')
parent_id = parent_id.text unless parent_id.nil?
size = ar.xpath('AR/SIZE').text.to_i
if !parent_id.nil?
vnet_usage[parent_id] = 0 if vnet_usage[parent_id].nil?
vnet_usage[parent_id] += size
end
end
end

Progress Status

  • Branch created
  • Code committed to development branch
  • Testing - QA
  • Documentation
  • Release notes - resolved issues, compatibility, known issues
  • Code committed to upstream release/hotfix branches
  • Documentation committed to upstream release/hotfix branches
kvaps added a commit to kvaps/one that referenced this issue Mar 10, 2020
@kvaps
B OpenNebula#4334: fix reserved networks count
59157d2 
Signed-off-by: kvaps <[email protected]>
@kvaps kvaps mentioned this issue Mar 10, 2020
Merged
kvaps added a commit to kvaps/kube-opennebula that referenced this issue Mar 10, 2020
@kvaps
apply patch for onedb fsck
7b73328 
OpenNebula/one#4334
rsmontero pushed a commit that referenced this issue Mar 16, 2020
@kvaps
B #4334: fix reserved networks count (#4335)
cb1b904 
Signed-off-by: kvaps <[email protected]>
rsmontero pushed a commit that referenced this issue Mar 16, 2020
@kvaps @rsmontero
B #4334: fix reserved networks count (#4335)
997dd4b 
Signed-off-by: kvaps <[email protected]>
(cherry picked from commit cb1b904)
atodorov-storpool pushed a commit to storpool/one that referenced this issue Mar 16, 2020
@kvaps @atodorov-storpool
B OpenNebula#4334: fix reserved networks count (OpenNebula#4335)
9de9564 
Signed-off-by: kvaps <[email protected]>
(cherry picked from commit cb1b904)
christian7007 pushed a commit that referenced this issue Mar 17, 2020
@kvaps
B #4334: fix reserved networks count (#4335)
6f5aec7 
Signed-off-by: kvaps <[email protected]>
rsmontero pushed a commit that referenced this issue Apr 7, 2020
@kvaps @rsmontero
B #4334: fix reserved networks count (#4335)
8bc3b13 
Signed-off-by: kvaps <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

B #4334: fix reserved networks count kvaps/one
1 participant
@kvaps