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.

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

Feature branch sync to master #5525

Merged
merged 102 commits into from
Mar 21, 2024
Merged

Conversation

liulinC
Copy link
Collaborator

@liulinC liulinC commented Mar 21, 2024

No description provided.

ydirson and others added 30 commits February 9, 2024 17:20
Different network card (like virtual ones or USB ones) do not
have a vendor:product causing networkd daemon to report a lot
of errors like

  Error in read one line of file: /sys/class/net/eth0/device/device, exception Unix.Unix_error(Unix.ENOENT, "open", "/sys/class/net/eth0/device/device")
  Raised by primitive operation at Xapi_stdext_unix__Unixext.with_file in file "lib/xapi-stdext-unix/unixext.ml", line 68, characters 11-40
  Called from Xapi_stdext_unix__Unixext.buffer_of_file in file "lib/xapi-stdext-unix/unixext.ml" (inlined), line 155, characters 31-83
  Called from Xapi_stdext_unix__Unixext.string_of_file in file "lib/xapi-stdext-unix/unixext.ml", line 157, characters 47-73
  Called from Network_utils.Sysfs.read_one_line in file "ocaml/networkd/lib/network_utils.ml", line 156, characters 6-33

Do not report these missing file as errors.

Signed-off-by: Frediano Ziglio <[email protected]>
… in C# SDK

Also:
- Rename `README.dist` and `README-NuGet.dist` to `README.md` and `README-NuGet.md`
- Change content of aforementioned READMEs to use markdown
- Remove mentions of patched Json.NET library
- Update copyright notice year
- Do not add `.txt` extension to `LICENSE` file

Signed-off-by: Danilo Del Busso <[email protected]>
Signed-off-by: Danilo Del Busso <[email protected]>
Hyphens are converted when using `ResGen.exe` but they shouldn't be used to keep a consistent style

Signed-off-by: Danilo Del Busso <[email protected]>
Enables building without the use of `ResGen.exe`

Signed-off-by: Danilo Del Busso <[email protected]>
- New pif helper: `get_non_link_ipv6` to get
the 1st non link IPv6 of a PIF

- Use the helper in `migrate_receive` and `get_primary_address`
used in host evacuation to have a valid IPv6 of the destination host

Co-authored-by: Pau Ruiz Safont <[email protected]>
Signed-off-by: Benjamin Reis <[email protected]>
Also:
- Update copyright notices
- Update `README` files to use markdown
- Add `.gitignore` file
- Drop extension from `LICENSE.txt`
- Add `.sln` file since it's needed for NuGet usage in VS22
- Add .NET 8.0 to list of target frameworks for the SDK project
- Ensure all DLLs are placed in `bin/` when running `dotnet build`. Without `CopyLocalLockFileAssemblies = true` this is not the case for .NET builds.

Signed-off-by: Danilo Del Busso <[email protected]>
Makes use of new composite action that sets up a XenAPI environment in a Ubuntu node.

Signed-off-by: Danilo Del Busso <[email protected]>
This can then be used by observer.py, whereas the value 'bugtool' was
useless

Signed-off-by: Steven Woods <[email protected]>
This enables the sampled flag
(https://www.w3.org/TR/trace-context/#sampled-flag). This indicates that
we may have recorded trace data. In the future if we use sampling, this
flag can be set with more granularity.

Signed-off-by: Steven Woods <[email protected]>
This is necessary for the python observers to set their local endpoint
value. It also allows filtering traces by component

Signed-off-by: Steven Woods <[email protected]>
The default_attributes are not added to the DB and so these are missing
in the observer.conf. Dom0ObserverConfig currently lacks a single source
of truth outside of the DB (and default_attributes is not given to the
DB) and so attributes outside of the DB are lost whenever a different
setter function is used. This should be reworked in future so that
observer.conf is read from/updated instead of regenerated each time.

Signed-off-by: Steven Woods <[email protected]>
This is intended as the start of a new directory structure. Splitting
the python3-only scripts into a new directory gives a simple way to
exclude them from python2 tests and coverage.

Signed-off-by: Steven Woods <[email protected]>
It is not supported in scheduled runs, and fails.

Use unique key for shellcheck group

Signed-off-by: Edwin Török <[email protected]>
Co-authored-by: Pau Ruiz Safont <[email protected]>
Signed-off-by: Török Edwin <[email protected]>
…info

Add 'threads_per_core' in 'Host.cpu_info'
`xapi_xenpos.ml` -> `xapi_xenops.ml`

Signed-off-by: Luca Zhang <[email protected]>
Add support for clusterd to write host name and uuid to corosync.conf on
each host. This is done by augmenting the address type with uuid info
rather than adding a new parameter to the cluster api calls which can
cause compatibility issues during pool upgrade.

Signed-off-by: Vincent Liu <[email protected]>
Signed-off-by: Vincent Liu <[email protected]>
psafont and others added 21 commits March 11, 2024 10:31
[email protected]

GitHub Action to read .env files: Update to falti/dotenv-action@v1 (fixes Node 16 warnings)
shellscripts: fix the worse complaints from shellcheck
The custom logrotation setup for xapi sometimes conflicted with the normal one.
Remove the former.

Install the xapi logrotate configuration has been moved to be managed as part
of the normal logrotation, with the global settings removed.

Duplicate settings in the configuration have been removed.

Signed-off-by: Pau Ruiz Safont <[email protected]>
Also update URL in `pom.xml`

Signed-off-by: Danilo Del Busso <[email protected]>
The bug is in parsing the output of 'xen-livepatch list'. The following
output can't be parsed correctly:
lp_4.17.3-3.11.gf717213.xs8-4.17.3-3.12.xs8| CHECKED

The regex pattern doesn't exclude the '|' after 'xs8'. As a result, the
vertical line '|' is parsed as part of '3.12.xs8|'. The correct one should be
'3.12.xs8'.

Signed-off-by: Ming Lu <[email protected]>
…389840

CA-389840: Bug in parsing output of 'xen-livepatch list'
…CP-48430

CP-48430 Update the running_domains metrics to include the blocked state domains
[OIL] Moved some more generation code to templates.
Not used. It was never implemented.

Signed-off-by: Frediano Ziglio <[email protected]>
Not used.

Signed-off-by: Frediano Ziglio <[email protected]>
Before these changes, the `SaveCertificates` method relied on machines having a `SpecialFolder.MyDocuments` folder. This is true in Windows and GUI versions of some Linux distros, but it's an assumption that caused the save method to fail if the folder didn't exist.

With this commit, we're storing and reading from the path where `$PROFILE` is stored, which is platform agnostic from the point of view of the SDK.

Signed-off-by: Danilo Del Busso <[email protected]>
@liulinC liulinC changed the base branch from master to feature/xs9 March 21, 2024 01:19
Copy link

codecov bot commented Mar 21, 2024

Codecov Report

Merging #5525 (3d5f055) into feature/xs9 (b11f678) will increase coverage by 2.7%.
The diff coverage is 73.8%.

Additional details and impacted files
@@              Coverage Diff              @@
##           feature/xs9   #5525     +/-   ##
=============================================
+ Coverage         49.0%   51.8%   +2.7%     
=============================================
  Files               18      19      +1     
  Lines             2319    2586    +267     
=============================================
+ Hits              1138    1341    +203     
- Misses            1181    1245     +64     
Files Coverage Δ
python3/tests/test_observer.py 100.0% <100.0%> (ø)
python3/packages/observer.py 64.3% <64.3%> (ø)
Flag Coverage Δ
python2.7 53.6% <ø> (+0.2%) ⬆️
python3.11 58.1% <73.8%> (+2.3%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@liulinC liulinC requested review from minglumlu and gangj March 21, 2024 01:20
Copy link
Contributor

@gangj gangj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the title should be: "Feature branch sync from master"? :)

The 3 commits ahead of xapi-project/xen-api:master here: https://github.com/liulinC/xen-api/tree/private/linl/dev is a little confusing, but checked the last merge commit:

gangj@gangj-OptiPlex-7050:~/Documents/dev_env/Wukong/xen-api$ git show 3d5f055b12
commit 3d5f055b12026e68dc67d5e9b440ec68ba7c286e (HEAD -> private/linl/dev, liulinC/private/linl/dev)
Merge: b11f6788d 9fcfbfc22
Author: Lin Liu <[email protected]>
Date:   Thu Mar 21 01:17:34 2024 +0000

    Merge branch 'master' into private/linl/dev

gangj@gangj-OptiPlex-7050:~/Documents/dev_env/Wukong/xen-api$ git log -1 3d5f055b12
commit 3d5f055b12026e68dc67d5e9b440ec68ba7c286e (HEAD -> private/linl/dev, liulinC/private/linl/dev)
Merge: b11f6788d 9fcfbfc22
Author: Lin Liu <[email protected]>
Date:   Thu Mar 21 01:17:34 2024 +0000

    Merge branch 'master' into private/linl/dev
gangj@gangj-OptiPlex-7050:~/Documents/dev_env/Wukong/xen-api$ 

It is indeed just a merge from the latest master(latest commit: 9fcfbfc) to the feature branch: xapi-project:feature/xs9 (latest commit: b11f678) with no conflict.

Copy link
Member

@psafont psafont left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the difference between feature/xs9 and feature/py3?

@psafont psafont merged commit 4b83c2f into xapi-project:feature/xs9 Mar 21, 2024
28 checks passed
Copy link

pytype_reporter extracted 50 problem reports from pytype output

.

You can check the results of the job here

@liulinC
Copy link
Collaborator Author

liulinC commented Mar 22, 2024

What's the difference between feature/xs9 and feature/py3?

@psafont

  • feature/py3 focus on the py2->py3 update, as titled.

  • feature/xs9 cover anything specially for XS9. for example.
    -- yum -> dnf update
    -- some software, like gpg interface change between XS8 and XS9.
    -- Anything special to XS9.

    We separate the tasks/branch to unblock each other, in theory, py3 update can benefit XS8 LTSR as well if we want to get that included. Hope this clarify the question.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.